[wsas-java-dev] svn commit r1058 - in
branches/wsas/java/standalone-tomcat/java/modules:
distribution/standalone standalone-edition/src/org/wso2/wsas
standalone-edition/test/org/wso2/wsas
standalone-edition/test/org/wso2/wsas/util www
svn at wso2.org
svn at wso2.org
Mon Feb 26 02:47:18 PST 2007
Author: azeez
Date: Mon Feb 26 02:46:03 2007
New Revision: 1058
Added:
branches/wsas/java/standalone-tomcat/java/modules/www/favicon.ico (contents, props changed)
- copied, changed from r1027, branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/favicon.ico
Removed:
branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/favicon.ico
Modified:
branches/wsas/java/standalone-tomcat/java/modules/distribution/standalone/pom.xml
branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/Main.java
branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/test/org/wso2/wsas/TomcatServerTest.java
branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/test/org/wso2/wsas/util/ServerUtils.java
Log:
Show Favicon
Modified: branches/wsas/java/standalone-tomcat/java/modules/distribution/standalone/pom.xml
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/distribution/standalone/pom.xml (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/distribution/standalone/pom.xml Mon Feb 26 02:46:03 2007
@@ -230,6 +230,7 @@
<exclude name="**/**.css"/>
<exclude name="**/**.xsl"/>
<exclude name="**/**.js"/>
+ <exclude name="**/pom.xml"/>
</fileset>
</copy>
<copy todir="${dist.temp.dir}/tomcat/webapps/ROOT"
@@ -252,6 +253,8 @@
<exclude name="**/**.css"/>
<exclude name="**/**.xsl"/>
<exclude name="**/**.js"/>
+ <exclude name="**/**.iml"/>
+ <exclude name="**/pom.xml"/>
</fileset>
</copy>
<copy todir="${dist.temp.dir}/tomcat/webapps/ROOT"
@@ -263,13 +266,6 @@
<include name="**/**.js"/>
</fileset>
</copy>
- <!--<mkdir dir="${dist.temp.dir}/lib/styles"/>
- <move toDir="${dist.temp.dir}/lib/styles">
- <fileset
- dir="${dist.temp.dir}/tomcat/webapps/ROOT/styles">
- <include name="**"/>
- </fileset>
- </move>-->
<copy todir="${dist.temp.dir}/tomcat/webapps/ROOT/WEB-INF">
<fileset file="../../core/conf/web.xml"/>
</copy>
Modified: branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/Main.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/Main.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/Main.java Mon Feb 26 02:46:03 2007
@@ -48,8 +48,6 @@
public static XmlConfiguration xmlConfiguration;
public Main() {
- System.setProperty(ServerConstants.WSO2WSAS_START_TIME,
- String.valueOf(System.currentTimeMillis()));
if (System.getProperty(ServerConstants.WSO2WSAS_HOME) == null) {
System.setProperty(ServerConstants.WSO2WSAS_HOME, ".");
System.setProperty(ServerConstants.AXIS2_HOME, ".");
@@ -104,6 +102,8 @@
}
public static void main(String[] args) {
+ System.setProperty(ServerConstants.WSO2WSAS_START_TIME,
+ String.valueOf(System.currentTimeMillis()));
String cmd;
if (args.length >= 1) {
cmd = args[0];
@@ -112,7 +112,6 @@
return;
}
- long before = System.currentTimeMillis();
final Main main = new Main();
if (cmd.toUpperCase().endsWith(COMMAND_START) || cmd.toUpperCase().endsWith(COMMAND_RUN)) {
Modified: branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/test/org/wso2/wsas/TomcatServerTest.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/test/org/wso2/wsas/TomcatServerTest.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/test/org/wso2/wsas/TomcatServerTest.java Mon Feb 26 02:46:03 2007
@@ -46,10 +46,11 @@
}
public void testEchoXMLSync() throws Exception {
- OMElement payload = createDummyOMElement();
+ OMElement payload = getTestPayload();
ConfigurationContext configContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem(TestConstants.TESTING_REPO, null);
+ ConfigurationContextFactory.
+ createConfigurationContextFromFileSystem(TestConstants.TESTING_REPO, null);
ServiceClient sender = new ServiceClient(configContext, null);
EndpointReference targetEPR =
@@ -75,7 +76,7 @@
serverUtils.shutdown();
}
- public static OMElement createDummyOMElement() {
+ public static OMElement getTestPayload() {
OMFactory fac = OMAbstractFactory.getOMFactory();
QName requtestQName = new QName("http://version.services.wsas.wso2.org/xsd",
"getVersionRequest");
Modified: branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/test/org/wso2/wsas/util/ServerUtils.java
==============================================================================
--- branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/test/org/wso2/wsas/util/ServerUtils.java (original)
+++ branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/test/org/wso2/wsas/util/ServerUtils.java Mon Feb 26 02:46:03 2007
@@ -15,14 +15,13 @@
*/
package org.wso2.wsas.util;
-import org.wso2.wsas.TestConstants;
-import org.wso2.wsas.Main;
-import org.wso2.utils.ServerException;
-import org.wso2.utils.ServerConfiguration;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
+import org.wso2.utils.ServerConfiguration;
+import org.wso2.utils.ServerException;
+import org.wso2.wsas.Main;
import javax.xml.namespace.QName;
@@ -102,10 +101,9 @@
main = new Main();
} else {
ServerConfiguration.configurationXMLLocation = wso2wsasConfigLocation;
- main = new Main(ServerConfiguration.getInstance());
+ main = new Main();
}
main.setTestMode(true);
- main.setAxis2RepoLocation(TestConstants.TESTING_REPO);
main.startServer();
Thread.sleep(1000);
}
@@ -116,7 +114,6 @@
} catch (InterruptedException e) {
e.printStackTrace();
}
-
}
public void shutdown() throws ServerException {
@@ -129,11 +126,8 @@
return main;
}
- public synchronized void undeployService(
- ConfigurationContext configurationContext, QName service)
- throws AxisFault {
- configurationContext.getAxisConfiguration()
- .removeService(service.getLocalPart());
+ public synchronized void undeployService(ConfigurationContext configCtx,
+ QName service) throws AxisFault {
+ configCtx.getAxisConfiguration().removeService(service.getLocalPart());
}
-
}
Copied: branches/wsas/java/standalone-tomcat/java/modules/www/favicon.ico (from r1027, branches/wsas/java/standalone-tomcat/java/modules/standalone-edition/src/org/wso2/wsas/favicon.ico)
==============================================================================
Binary files. No diff available.
More information about the Wsas-java-dev
mailing list