You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by he...@apache.org on 2005/02/18 11:01:03 UTC
svn commit: r154255 [2/2] - in webservices/axis/trunk/java: ./ etc/
modules/common/ modules/common/src/ modules/common/src/java/
modules/common/src/test/ modules/core/
modules/core/src/java/org/apache/axis/engine/
modules/core/src/java/org/apache/axis/phaseresolver/
modules/core/src/java/org/apache/axis/transport/http/
modules/core/src/test/org/apache/axis/description/
modules/core/src/test/org/apache/axis/encoding/
modules/core/src/test/org/apache/axis/engine/
modules/core/src/test/org/apache/axis/integration/
modules/core/src/test/org/apache/axis/testUtils/ modules/deployment/
modules/deployment/src/java/org/apache/axis/deployment/ modules/om/
modules/om/src/test/org/apache/axis/om/
modules/om/src/test/org/apache/axis/om/builder/
modules/om/src/test/org/apache/axis/om/impl/traverse/ modules/samples/
modules/samples/src/java/org/apache/
modules/samples/src/java/org/apache/axis/
modules/samples/src/java/org/apache/axis/testUtils/
modules/samples/src/test/ modules/samples/src/test/org/
modules/samples/src/test/org/apache/
modules/samples/src/test/org/apache/axis/
modules/samples/src/test/org/apache/axis/encoding/
modules/samples/src/test/org/apache/axis/engine/
modules/samples/src/test/org/apache/axis/integration/
modules/samples/src/test/org/apache/axis/om/
modules/samples/src/test/org/apache/axis/om/builder/ modules/wsdl/
Added: webservices/axis/trunk/java/modules/samples/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.properties?view=auto&rev=154255
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.properties (added)
+++ webservices/axis/trunk/java/modules/samples/project.properties Fri Feb 18 02:00:53 2005
@@ -0,0 +1,18 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+maven.repo.remote=http://cvs.apache.org/repository/, http://www.ibiblio.org/maven,http://www.apache.org/dist/java-repository/
+maven.multiproject.type=jar
Added: webservices/axis/trunk/java/modules/samples/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/project.xml?view=auto&rev=154255
==============================================================================
--- webservices/axis/trunk/java/modules/samples/project.xml (added)
+++ webservices/axis/trunk/java/modules/samples/project.xml Fri Feb 18 02:00:53 2005
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+
+ <id>axis2-samples</id>
+ <name>samples</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis2-core</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis2-om</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis2-wsdl</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis2-deployment</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <!-- external JARs -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-servlet</artifactId>
+ <version>2.4-rc3</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
+
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>1.2-RC1</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.1-dev</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+
+
+
+ </dependencies>
+</project>
Modified: webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/encoding/EncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/encoding/EncodingTest.java?view=diff&r1=154238&r2=154255
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/encoding/EncodingTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/encoding/EncodingTest.java Fri Feb 18 02:00:53 2005
@@ -15,21 +15,23 @@
*/
package org.apache.axis.encoding;
-import org.apache.axis.AbstractTestCase;
-import org.apache.axis.engine.AxisFault;
-import org.apache.axis.om.OMElement;
-import org.apache.axis.om.OMFactory;
-import org.apache.axis.om.OMNamespace;
-import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
+import java.lang.reflect.Method;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import java.lang.reflect.Method;
+
+import junit.framework.TestCase;
+
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
-public class EncodingTest extends AbstractTestCase {
+public class EncodingTest extends TestCase {
/**
Modified: webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/integration/EchoTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/integration/EchoTest.java?view=diff&r1=154238&r2=154255
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/integration/EchoTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/integration/EchoTest.java Fri Feb 18 02:00:53 2005
@@ -16,18 +16,6 @@
package org.apache.axis.integration;
-import junit.framework.TestCase;
-
-import org.apache.axis.Constants;
-import org.apache.axis.addressing.AddressingConstants;
-import org.apache.axis.addressing.EndpointReference;
-import org.apache.axis.clientapi.Call;
-import org.apache.axis.engine.EngineUtils;
-import org.apache.axis.om.*;
-import org.apache.axis.testUtils.*;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -35,6 +23,27 @@
import java.net.URL;
import java.net.URLClassLoader;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.TestCase;
+
+import org.apache.axis.Constants;
+import org.apache.axis.addressing.AddressingConstants;
+import org.apache.axis.addressing.EndpointReference;
+import org.apache.axis.clientapi.Call;
+import org.apache.axis.om.OMConstants;
+import org.apache.axis.om.OMElement;
+import org.apache.axis.om.OMFactory;
+import org.apache.axis.om.OMNamespace;
+import org.apache.axis.om.SOAPBody;
+import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.testUtils.ArrayTypeEncoder;
+import org.apache.axis.testUtils.Encoder;
+import org.apache.axis.testUtils.ObjectToOMBuilder;
+import org.apache.axis.testUtils.SimpleTypeEncoder;
+import org.apache.axis.testUtils.SimpleTypeEncodingUtils;
+
public class EchoTest extends TestCase {
private final OMFactory fac = OMFactory.newInstance();
@@ -77,7 +86,7 @@
EndpointReference targetEPR =
new EndpointReference(AddressingConstants.WSA_TO,
"http://127.0.0.1:"
- + (EngineUtils.TESTING_PORT)
+ + (org.apache.axis.integration.Constants.TESTING_PORT)
+ "/axis/services/echo");
Call call = new Call();
call.setTo(targetEPR);
Modified: webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/integration/UtilServer.java?view=diff&r1=154238&r2=154255
==============================================================================
--- webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/src/test/org/apache/axis/integration/UtilServer.java Fri Feb 18 02:00:53 2005
@@ -16,17 +16,16 @@
package org.apache.axis.integration;
+import java.net.ServerSocket;
+
+import javax.xml.namespace.QName;
+
import org.apache.axis.description.AxisService;
import org.apache.axis.engine.AxisFault;
import org.apache.axis.engine.EngineRegistry;
import org.apache.axis.engine.EngineRegistryFactory;
-import org.apache.axis.engine.EngineUtils;
import org.apache.axis.transport.http.SimpleHTTPServer;
-import javax.xml.namespace.QName;
-import java.io.IOException;
-import java.net.ServerSocket;
-
public class UtilServer {
private static int count = 0;
private static SimpleHTTPServer reciver;
@@ -42,10 +41,12 @@
reciver.getEngineReg().removeService(service);
}
- public static synchronized void start() throws IOException {
+ public static synchronized void start() throws Exception {
if (count == 0) {
- EngineRegistry er =
- EngineRegistryFactory.createEngineRegistry("target/test-resources/samples/");
+ Class erClass = Class.forName("org.apache.axis.deployment.EngineRegistryFactoryImpl");
+ EngineRegistryFactory erfac = (EngineRegistryFactory)erClass.newInstance();
+ EngineRegistry er =
+ erfac.createEngineRegistry("target/test-resources/samples/");
try {
Thread.sleep(2000);
} catch (InterruptedException e1) {
@@ -55,14 +56,14 @@
reciver = new SimpleHTTPServer(er);
ServerSocket serverSoc = null;
- serverSoc = new ServerSocket(EngineUtils.TESTING_PORT);
+ serverSoc = new ServerSocket(Constants.TESTING_PORT);
reciver.setServerSocket(serverSoc);
Thread thread = new Thread(reciver);
thread.setDaemon(true);
try {
thread.start();
- System.out.print("Server started on port " + EngineUtils.TESTING_PORT + ".....");
+ System.out.print("Server started on port " + Constants.TESTING_PORT + ".....");
} finally {
}
Added: webservices/axis/trunk/java/modules/wsdl/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/project.properties?view=auto&rev=154255
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/project.properties (added)
+++ webservices/axis/trunk/java/modules/wsdl/project.properties Fri Feb 18 02:00:53 2005
@@ -0,0 +1,18 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+
+maven.repo.remote=http://cvs.apache.org/repository/, http://www.ibiblio.org/maven,http://www.apache.org/dist/java-repository/
+maven.multiproject.type=jar
Added: webservices/axis/trunk/java/modules/wsdl/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/wsdl/project.xml?view=auto&rev=154255
==============================================================================
--- webservices/axis/trunk/java/modules/wsdl/project.xml (added)
+++ webservices/axis/trunk/java/modules/wsdl/project.xml Fri Feb 18 02:00:53 2005
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+
+ <id>axis2-wsdl</id>
+ <name>wsdl</name>
+
+ <dependencies>
+ <!-- external JARs -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>1.2-RC1</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.1.1-dev</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ <url>http://dist.codehaus.org/stax/jars/</url>
+ </dependency>
+ </dependencies>
+</project>
Added: webservices/axis/trunk/java/navigation.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/navigation.xml?view=auto&rev=154255
==============================================================================
--- webservices/axis/trunk/java/navigation.xml (added)
+++ webservices/axis/trunk/java/navigation.xml Fri Feb 18 02:00:53 2005
@@ -0,0 +1,13 @@
+<!-- Created By Eran Chinthaka -->
+<project name="Axis2.0">
+ <title>Axis2.0</title>
+ <body>
+ <links>
+ <item href="http://maven.apache.org/" name="Maven">
+ </item>
+ </links>
+ <menu name="References">
+ <item name="Architecture Guide" href="Axis 2 Architecture Guide.html" />
+ </menu>
+ </body>
+</project>
\ No newline at end of file
Added: webservices/axis/trunk/java/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/project.properties?view=auto&rev=154255
==============================================================================
--- webservices/axis/trunk/java/project.properties (added)
+++ webservices/axis/trunk/java/project.properties Fri Feb 18 02:00:53 2005
@@ -0,0 +1,14 @@
+##
+## $Revision: 1.3 $ $Date: 2004/07/28 15:21:22 $
+##
+maven.multiproject.includes=modules/*/project.xml
+maven.repo.remote=http://www.apache.org/dist/java-repository,http://dist.codehaus.org,http://www.ibiblio.org/maven,http://cvs.apache.org/repository/
+maven.xdoc.date=left
+maven.xdoc.version=${pom.currentVersion}
+
+maven.jar.excludes=**/jndi.properties
+
+maven.clover.license.path=clover.license
+
+maven.html2xdoc.enabled=true
+maven.html2xdoc.dir=./xdocs
Added: webservices/axis/trunk/java/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/project.xml?view=auto&rev=154255
==============================================================================
--- webservices/axis/trunk/java/project.xml (added)
+++ webservices/axis/trunk/java/project.xml Fri Feb 18 02:00:53 2005
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>etc/project.xml</extend>
+</project>