[esb-java-dev] svn commit r763 - in trunk/esb/java: .
modules/core/src/main/java/org/wso2/esb/services/utils
modules/core/src/main/java/org/wso2/esb/transport/jetty
modules/core/src/main/java/org/wso2/esb/util
modules/distribution modules/distribution/src/main/bin
modules/distribution/src/main/conf modules/distribution/src/main/www
modules/distribution/src/main/www/extensions/core/js
svn at wso2.org
svn at wso2.org
Tue Feb 6 00:08:57 PST 2007
Author: asankha
Date: Tue Feb 6 00:08:18 2007
New Revision: 763
Removed:
trunk/esb/java/modules/distribution/src/main/www/index.html
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/Axis2Handler.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/ManagementConsoleRequestHandler.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/ServerDefaultHandler.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XmlConfiguration.java
trunk/esb/java/modules/distribution/pom.xml
trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
trunk/esb/java/modules/distribution/src/main/conf/log4j.properties
trunk/esb/java/modules/distribution/src/main/conf/server.xml
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/esb.js
trunk/esb/java/pom.xml
Log:
update to 1.0 beta 1 release level
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/utils/ServerData.java Tue Feb 6 00:08:18 2007
@@ -21,7 +21,7 @@
private String axis2Location;
private String serverName;
private String repoLocation;
- private String wso2wsasVersion;
+ private String wso2esbVersion;
public ServerData(String serverName, String repoLocation) {
init();
@@ -45,7 +45,7 @@
userName = System.getProperty("user.name");
javaHome = System.getProperty("java.home");
javaVersion = System.getProperty("java.version");
- wso2wsasVersion = ServiceBusConfiguration.getInstance().getFirstProperty("Version");
+ wso2esbVersion = ServiceBusConfiguration.getInstance().getFirstProperty("Version");
axis2Location = axis2Location();
}
@@ -185,11 +185,11 @@
this.repoLocation = repoLocation;
}
- public String getWso2wsasVersion() {
- return wso2wsasVersion;
+ public String getWso2esbVersion() {
+ return wso2esbVersion;
}
- public void setWso2wsasVersion(String wso2wsasVersion) {
- this.wso2wsasVersion = wso2wsasVersion;
+ public void setWso2esbVersion(String wso2esbVersion) {
+ this.wso2esbVersion = wso2esbVersion;
}
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/Axis2Handler.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/Axis2Handler.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/Axis2Handler.java Tue Feb 6 00:08:18 2007
@@ -195,7 +195,7 @@
response.setStatus(stateInt);
if (stateInt == 401) { // Unauthorized
response.addHeader("WWW-Authenticate",
- "basic realm=\"WSO2 WSAS Users\"");
+ "basic realm=\"WSO2 ESB Users\"");
}
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/ManagementConsoleRequestHandler.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/ManagementConsoleRequestHandler.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/ManagementConsoleRequestHandler.java Tue Feb 6 00:08:18 2007
@@ -35,7 +35,7 @@
this.configurationContext = configurationContext;
try {
faviconProvider = new FaviconProvider();
- faviconProvider.setFavIconFromResource("org/wso2/wsas/transport/jetty/favicon.ico");
+ faviconProvider.setFavIconFromResource("org/wso2/esb/transport/jetty/favicon.ico");
} catch (Exception e) {
log.warn(e);
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/ServerDefaultHandler.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/ServerDefaultHandler.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/transport/jetty/ServerDefaultHandler.java Tue Feb 6 00:08:18 2007
@@ -30,7 +30,7 @@
public ServerDefaultHandler() {
try {
faviconProvider = new FaviconProvider();
- faviconProvider.setFavIconFromResource("org/wso2/wsas/transport/jetty/favicon.ico");
+ faviconProvider.setFavIconFromResource("org/wso2/esb/transport/jetty/favicon.ico");
} catch (Exception e) {
Log.warn(e);
}
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XmlConfiguration.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XmlConfiguration.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XmlConfiguration.java Tue Feb 6 00:08:18 2007
@@ -21,7 +21,6 @@
private StAXOMBuilder builder;
- /* Default namespace is set to http://www.wso2.org/products/wsas */
private String serverNamespace = Constants.ESB_XML_NAMESPACE;
public XmlConfiguration(String xmlFile) throws ServerException {
Modified: trunk/esb/java/modules/distribution/pom.xml
==============================================================================
--- trunk/esb/java/modules/distribution/pom.xml (original)
+++ trunk/esb/java/modules/distribution/pom.xml Tue Feb 6 00:08:18 2007
@@ -72,7 +72,7 @@
<artifactItems>
<artifactItem>
<groupId>org.wso2.adminui</groupId>
- <artifactId>wso2-adminui-zip</artifactId>
+ <artifactId>wso2adminui</artifactId>
<version>${wso2.adminui.version}</version>
<type>zip</type>
<outputDirectory>target/temp/lib</outputDirectory>
@@ -93,6 +93,7 @@
<type>jar</type>
<outputDirectory>target/temp/lib</outputDirectory>
</artifactItem>
+
<artifactItem>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -108,10 +109,11 @@
<type>mar</type>
<outputDirectory>target/temp/lib</outputDirectory>
</artifactItem>
+
<artifactItem>
<groupId>org.wso2.statistics</groupId>
<artifactId>wso2statistics</artifactId>
- <version>${wso2wsf.version}</version>
+ <version>${wso2commons.version}</version>
<type>mar</type>
<outputDirectory>target/temp/lib</outputDirectory>
</artifactItem>
@@ -131,10 +133,10 @@
<phase>package</phase>
<configuration>
<tasks>
- <unzip src="target/temp/lib/wso2-adminui-zip-${wso2.adminui.version}.zip"
+ <unzip src="target/temp/lib/wso2adminui-${wso2.adminui.version}.zip"
dest="target/temp/lib/www-raw"/>
<unzip src="target/temp/lib/wso2-adminui-graphs-zip-${wso2.adminui.version.graphs}.zip"
- dest="target/temp/lib/www-raw"/>
+ dest="target/temp/lib/www-raw"/>
<filter token="server_name" value="${server.name}"/>
<filter token="server_short_name" value="${server.short.name}"/>
<filter token="esb_version" value="${wso2.esb.version}"/>
Modified: trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat (original)
+++ trunk/esb/java/modules/distribution/src/main/bin/wso2-esb.bat Tue Feb 6 00:08:18 2007
@@ -126,16 +126,16 @@
:jdk14
echo Starting WSO2 Enterprise Service Bus (on JDK 1.4)
- set ESB_CLASS_PATH=%WSO2WSAS_HOME%\lib\bcprov-jdk13-132.jar;%ESB_CLASS_PATH%
+ set ESB_CLASS_PATH=%ESB_HOME%\lib\bcprov-jdk13-132.jar;%ESB_CLASS_PATH%
goto runServer
:jdk15
echo Starting WSO2 Enterprise Service Bus (on JDK 1.5)
- set ESB_CLASS_PATH=%WSO2WSAS_HOME%\lib\bcprov-jdk15-132.jar;%ESB_CLASS_PATH%
+ set ESB_CLASS_PATH=%ESB_HOME%\lib\bcprov-jdk15-132.jar;%ESB_CLASS_PATH%
goto runServer
:jdk16
echo Starting WSO2 Enterprise Service Bus (on JDK 1.6)
- echo [WARNING] WSO2 WSAS has not been fully tested on JDK 1.6
- set ESB_CLASS_PATH=%WSO2WSAS_HOME%\lib\bcprov-jdk15-132.jar;%ESB_CLASS_PATH%
+ echo [WARNING] WSO2 ESB has not been fully tested on JDK 1.6
+ set ESB_CLASS_PATH=%ESB_HOME%\lib\bcprov-jdk15-132.jar;%ESB_CLASS_PATH%
goto runServer
rem ----------------- Execute The Requested Command ----------------------------
Modified: trunk/esb/java/modules/distribution/src/main/conf/log4j.properties
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/log4j.properties (original)
+++ trunk/esb/java/modules/distribution/src/main/conf/log4j.properties Tue Feb 6 00:08:18 2007
@@ -16,7 +16,7 @@
log4j.rootCategory=ERROR,logfile,stdout,LOG_MEMORYAPPENDER
-# Trace Logger and appender which writes to a jabber
+## Trace Logger configuration which will append to a XMPP chatroom or JID ##
#log4j.logger.TRACE_LOGGER = TRACE,TRACE_APPENDER
#log4j.appender.TRACE_APPENDER = org.wso2.esb.tracing.IMAppender
#log4j.appender.TRACE_APPENDER.host =jabber.org
@@ -24,7 +24,7 @@
#log4j.appender.TRACE_APPENDER.password =wso2esb
#log4j.appender.TRACE_APPENDER.recipient =asankha at jabber.org
#log4j.appender.TRACE_APPENDER.layout=org.apache.log4j.PatternLayout
-#log4j.appender.TRACE_APPENDER.layout.ConversionPattern=[%X{ip}] [%X{host}] [%t] %-5p %C{1} - %m %n
+#log4j.appender.TRACE_APPENDER.layout.ConversionPattern=[%X{host}] [%t] %-5p [%d{HH:mm:ss,SSS}] %C{1} - %m%n
log4j.logger.TRACE_LOGGER = TRACE,TRACE_APPENDER,TRACE_MEMORYAPPENDER
@@ -33,30 +33,27 @@
log4j.appender.TRACE_APPENDER.File=logs/trace.log
log4j.appender.TRACE_APPENDER.Append=true
log4j.appender.TRACE_APPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.TRACE_APPENDER.layout.ConversionPattern=[%X{ip}] [%X{host}] [%t] %-5p %C{1} - %m %n
+log4j.appender.TRACE_APPENDER.layout.ConversionPattern=[%X{host}] [%t] %-5p [%d{HH:mm:ss,SSS}] %C{1} - %m%n
# The memory appender for trace logger
log4j.appender.TRACE_MEMORYAPPENDER=org.wso2.utils.MemoryAppender
log4j.appender.TRACE_MEMORYAPPENDER.bufferSize=200
-log4j.appender.TRACE_MEMORYAPPENDER.Append=true
log4j.appender.TRACE_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.TRACE_MEMORYAPPENDER.layout.ConversionPattern=[%X{ip}] [%X{host}] [%t] %-5p %C{1} - %m %n
+log4j.appender.TRACE_MEMORYAPPENDER.layout.ConversionPattern=[%X{host}] [%t] %-5p [%d{HH:mm:ss,SSS}] %C{1} - %m%n
# Set the level to DEBUG if you want to log all SlideExceptions (some of them aren't errors)
log4j.category.org.apache.axis2=INFO
log4j.category.org.apache.synapse=INFO
-log4j.category.org.wso2.wsas=INFO
log4j.category.org.wso2.esb=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p [%d] %x %c{1} - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%5p [%d{dd MMM HH:mm:ss}] %x %c{1} - %m%n
# The memory appender for logging
log4j.appender.LOG_MEMORYAPPENDER=org.wso2.utils.MemoryAppender
log4j.appender.LOG_MEMORYAPPENDER.bufferSize=200
-log4j.appender.LOG_MEMORYAPPENDER.Append=true
log4j.appender.LOG_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOG_MEMORYAPPENDER.layout.ConversionPattern=%5p [%d] %x %c{1} - %m%n
+log4j.appender.LOG_MEMORYAPPENDER.layout.ConversionPattern=%5p [%d{dd MMM yyyy HH:mm:ss}] %x %c{1} - %m%n
#### appender writes to a file
log4j.appender.logfile=org.apache.log4j.RollingFileAppender
log4j.appender.logfile.File=logs/wso2-esb.log
@@ -68,4 +65,4 @@
log4j.appender.logfile.MaxBackupIndex=10
log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=%5p [%d] [%t] %C{1} - %m%n
\ No newline at end of file
+log4j.appender.logfile.layout.ConversionPattern=%5p [%d{dd MMM yyyy HH:mm:ss}] %x %c{1} - %m%n
\ No newline at end of file
Modified: trunk/esb/java/modules/distribution/src/main/conf/server.xml
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/conf/server.xml (original)
+++ trunk/esb/java/modules/distribution/src/main/conf/server.xml Tue Feb 6 00:08:18 2007
@@ -93,7 +93,7 @@
<Actions>
<Action>*</Action>
</Actions>
- <Class>org.wso2.wsas.transport.fileupload.AnyFileUploadExecutor</Class>
+ <Class>org.wso2.esb.transport.fileupload.AnyFileUploadExecutor</Class>
</Mapping>
</FileUploadConfig>
</Server>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/esb.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/esb.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/esb.js Tue Feb 6 00:08:18 2007
@@ -21,6 +21,8 @@
var SERVICE_CONTEXT = "/soap";
+var SESSION_COOKIE_NAME = "JSESSIONID";
+var COOKIE_SESSION_MANAGEMENT = false;
var SYNAPSE_NS = "http://ws.apache.org/ns/synapse";
Modified: trunk/esb/java/pom.xml
==============================================================================
--- trunk/esb/java/pom.xml (original)
+++ trunk/esb/java/pom.xml Tue Feb 6 00:08:18 2007
@@ -155,9 +155,10 @@
</developers>
<scm>
- <connection>scm:svn:http://wso2.org/repos/wso2/wsas/java/</connection>
- <developerConnection>scm:svn:https://wso2.org/repos/wso2/wsas/java/</developerConnection>
- <url>https://wso2.org/repos/wso2/wsas/java/</url>
+ <connection>scm:svn:http://wso2.org/repos/wso2/trunk/esb/java</connection>
+ <developerConnection>scm:svn:https://wso2.org/repos/wso2/trunk/esb/java
+ </developerConnection>
+ <url>https://wso2.org/repos/wso2/trunk/esb/java/</url>
</scm>
<repositories>
@@ -246,37 +247,33 @@
</repositories>
<dependencies>
-
- <!-- WSO2 WSF Jars-->
+ <!-- WSO2 commons -->
<dependency>
<groupId>org.wso2.utils</groupId>
<artifactId>wso2utils</artifactId>
- <version>${wso2wsf.version}</version>
+ <version>${wso2commons.version}</version>
<type>jar</type>
</dependency>
-
- <!-- WSO2 commons -->
<dependency>
<groupId>org.wso2.throttle</groupId>
<artifactId>wso2throttle</artifactId>
- <version>${wso2wsf.version}</version>
- <type>jar</type>
+ <version>${wso2commons.version}</version>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.wso2.statistics</groupId>
<artifactId>wso2statistics</artifactId>
- <version>${wso2wsf.version}</version>
+ <version>${wso2commons.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.wso2.statistics</groupId>
<artifactId>wso2statistics</artifactId>
- <version>${wso2wsf.version}</version>
+ <version>${wso2commons.version}</version>
<type>mar</type>
</dependency>
-
<!-- ignore tcpmon -->
- <dependency>
+ <dependency>
<groupId>ws-commons</groupId>
<artifactId>tcpmon</artifactId>
<version>1.0</version>
@@ -287,18 +284,18 @@
<!-- AdminUI -->
<dependency>
<groupId>org.wso2.adminui</groupId>
- <artifactId>wso2-adminui</artifactId>
+ <artifactId>wso2adminui</artifactId>
<version>${wso2.adminui.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.wso2.adminui</groupId>
- <artifactId>wso2-adminui-zip</artifactId>
+ <artifactId>wso2adminui</artifactId>
<version>${wso2.adminui.version}</version>
<type>zip</type>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.wso2.adminui</groupId>
<artifactId>wso2-adminui-graphs-zip</artifactId>
<version>${wso2.adminui.version.graphs}</version>
@@ -372,7 +369,7 @@
<version>${bsf.version}</version>
</dependency>
- <!-- dependencies for nhttp transport -->
+ <!-- dependencies for nhttp transport -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>jakarta-httpcore</artifactId>
@@ -429,17 +426,17 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-security</artifactId>
- <version>${axis2.version}</version>
+ <version>${axis2.security.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-secpolicy</artifactId>
- <version>${axis2.version}</version>
+ <version>${axis2.security.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-rahas</artifactId>
- <version>${axis2.version}</version>
+ <version>${axis2.security.version}</version>
</dependency>
<dependency>
<groupId>wss4j</groupId>
@@ -785,9 +782,8 @@
<server.short.name>WSO2 ESB</server.short.name>
<wso2.esb.version>1.0-beta-1</wso2.esb.version>
- <wso2wsas.version>1.2-SNAPSHOT</wso2wsas.version>
- <wso2wsf.version>1.2-SNAPSHOT</wso2wsf.version>
- <wso2.adminui.version>1.1</wso2.adminui.version>
+ <wso2commons.version>1.2-SNAPSHOT</wso2commons.version>
+ <wso2.adminui.version>1.2-SNAPSHOT</wso2.adminui.version>
<wso2.adminui.version.graphs>1.1</wso2.adminui.version.graphs>
<synapse.version>SNAPSHOT</synapse.version>
<spring.version>1.2.6</spring.version>
@@ -798,7 +794,8 @@
<xerces.version>2.8.0</xerces.version>
<xalan.version>2.7.0</xalan.version>
<smack.version>2.2.1</smack.version>
- <axis2.version>1.1.1-SNAPSHOT</axis2.version>
+ <axis2.version>1.1.1</axis2.version>
+ <axis2.security.version>1.1</axis2.security.version>
<neethi.version>2.0</neethi.version>
<axiom.version>1.2.1</axiom.version>
@@ -813,7 +810,7 @@
<stax.impl.version>asl-3.1.0</stax.impl.version>
<stax.api.version>1.0.1</stax.api.version>
- <addressing.version>1.1.1-SNAPSHOT</addressing.version>
+ <addressing.version>1.1.1</addressing.version>
<rampart.version>1.1</rampart.version>
<sandesha2.version>1.1</sandesha2.version>
More information about the Esb-java-dev
mailing list