svn commit: r1387982 - /axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml
Author: veithen Date: Thu Sep 20 11:42:19 2012 New Revision: 1387982 URL: http://svn.apache.org/viewvc?rev=1387982&view=rev Log: Replaced tabs with spaces and fixed formatting. Modified: axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml Modified: axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml?rev=1387982&r1=1387981&r2=1387982&view=diff == --- axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml (original) +++ axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml Thu Sep 20 11:42:19 2012 @@ -7,34 +7,34 @@ - + - - - - - - - + + + + + + + - + - - + + - - + + - + - - - http://localhost:8080/axis/services/SimpleBean"; package="com.test.simplebean"/> - - + + +http://localhost:8080/axis/services/SimpleBean"; package="com.test.simplebean"/> + + @@ -44,21 +44,20 @@ - + - + - - - - - - - + + + + + + @@ -66,7 +65,7 @@ - + @@ -82,8 +81,8 @@ -http://localhost:8080/axis/services/SimpleBean"; namespace="http://localhost:8080/axis/services/SimpleBean"; @@ -91,13 +90,12 @@ -http://localhost:8080/axis/services/NiceThingsBean"; namespace="http://localhost:8080/axis/services/NiceThingsBean"; -namespaceImpl= - "http://localhost:8080/axis/services/NiceThingsBean";> + namespaceImpl="http://localhost:8080/axis/services/NiceThingsBean";> - - - + + +
svn commit: r1388110 - in /axis/axis1/java/trunk: axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/ distribution/ distribution/src/main/files/samples/ejb/
Author: veithen
Date: Thu Sep 20 16:38:49 2012
New Revision: 1388110
URL: http://svn.apache.org/viewvc?rev=1388110&view=rev
Log:
AXIS-1315: Fixed the java2wsdl task so that it loads classes specified using
from the right class loader (i.e. so that it takes into account a
nested element).
Modified:
axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/ComplexType.java
axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java
axis/axis1/java/trunk/distribution/pom.xml
axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml
Modified:
axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/ComplexType.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/ComplexType.java?rev=1388110&r1=1388109&r2=1388110&view=diff
==
---
axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/ComplexType.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/ComplexType.java
Thu Sep 20 16:38:49 2012
@@ -48,15 +48,15 @@ public class ComplexType {
this.namespace = namespace;
}
-public void register(TypeMapping tm) throws ClassNotFoundException {
-Class cl = Class.forName(className);
+public void register(ClassLoader cl, TypeMapping tm) throws
ClassNotFoundException {
+Class cls = cl.loadClass(className);
String localName = className.substring((className.lastIndexOf(".") +
1));
QName qName = new QName(namespace,localName);
SerializerFactory sf = BaseSerializerFactory.createFactory(
-Class.forName(serializer), cl, qName);
+cl.loadClass(serializer), cls, qName);
DeserializerFactory df = BaseDeserializerFactory.createFactory(
-Class.forName(deserializer), cl, qName);
+cl.loadClass(deserializer), cls, qName);
-tm.register(cl, qName, sf, df);
+tm.register(cls, qName, sf, df);
}
}
\ No newline at end of file
Modified:
axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java?rev=1388110&r1=1388109&r2=1388110&view=diff
==
---
axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java
Thu Sep 20 16:38:49 2012
@@ -144,7 +144,7 @@ public class Java2WsdlAntTask extends Ta
AntClassLoader cl = new AntClassLoader(getClass().getClassLoader(),
getProject(),
classpath == null ? createClasspath() : classpath,
-false);
+true);
CommandlineJava.SysProperties sysProperties =
commandline.getSystemProperties();
@@ -194,7 +194,7 @@ public class Java2WsdlAntTask extends Ta
TypeMappingDelegate tmi =
(TypeMappingDelegate)tmr.getDefaultTypeMapping();
Iterator i = complexTypes.iterator();
while (i.hasNext()) {
-((ComplexType) i.next()).register(tmi);
+((ComplexType) i.next()).register(cl, tmi);
}
if (style != null) {
Modified: axis/axis1/java/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/pom.xml?rev=1388110&r1=1388109&r2=1388110&view=diff
==
--- axis/axis1/java/trunk/distribution/pom.xml (original)
+++ axis/axis1/java/trunk/distribution/pom.xml Thu Sep 20 16:38:49 2012
@@ -93,6 +93,11 @@
+
+
+
+
+
@@ -129,6 +134,25 @@
junit
+
+copy-jboss-libs
+pre-integration-test
+
+copy
+
+
+
+
+jboss
+jboss-j2ee
+
svn commit: r1388113 - in /axis/axis1/java/trunk/distribution: pom.xml src/main/files/samples/ejb/ant-build.xml
Author: veithen Date: Thu Sep 20 16:57:21 2012 New Revision: 1388113 URL: http://svn.apache.org/viewvc?rev=1388113&view=rev Log: AXIS-1315: Also fixed the j2w-simplebean target. Modified: axis/axis1/java/trunk/distribution/pom.xml axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml Modified: axis/axis1/java/trunk/distribution/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/pom.xml?rev=1388113&r1=1388112&r2=1388113&view=diff == --- axis/axis1/java/trunk/distribution/pom.xml (original) +++ axis/axis1/java/trunk/distribution/pom.xml Thu Sep 20 16:57:21 2012 @@ -96,7 +96,10 @@ - + + + + Modified: axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml?rev=1388113&r1=1388112&r2=1388113&view=diff == --- axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml (original) +++ axis/axis1/java/trunk/distribution/src/main/files/samples/ejb/ant-build.xml Thu Sep 20 16:57:21 2012 @@ -80,7 +80,7 @@ - +
svn commit: r1388168 - in /axis/axis1/java/trunk: axis-rt-transports-http-javanet/ integration/ maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/ maven/maven-wsdl2java-
Author: veithen Date: Thu Sep 20 19:10:43 2012 New Revision: 1388168 URL: http://svn.apache.org/viewvc?rev=1388168&view=rev Log: Renamed the goals defined by maven-wsdl2java-plugin. Added: axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java - copied, changed from r1388090, axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/Wsdl2JavaMojo.java axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java - copied, changed from r1388090, axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/Wsdl2JavaTestMojo.java Removed: axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/Wsdl2JavaMojo.java axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/Wsdl2JavaTestMojo.java Modified: axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml axis/axis1/java/trunk/integration/pom.xml axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/site/apt/index.apt axis/axis1/java/trunk/samples/echo-sample/pom.xml axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml Modified: axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml?rev=1388168&r1=1388167&r2=1388168&view=diff == --- axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml (original) +++ axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml Thu Sep 20 19:10:43 2012 @@ -70,7 +70,7 @@ -wsdl2java-test +generate-test-sources src/test/wsdl/test.wsdl Modified: axis/axis1/java/trunk/integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388168&r1=1388167&r2=1388168&view=diff == --- axis/axis1/java/trunk/integration/pom.xml (original) +++ axis/axis1/java/trunk/integration/pom.xml Thu Sep 20 19:10:43 2012 @@ -175,7 +175,7 @@ samples-echo -wsdl2java-test +generate-test-sources ../samples/echo-sample/src/main/wsdl/InteropTest.wsdl @@ -195,7 +195,7 @@ samples-addr -wsdl2java-test +generate-test-sources ../distribution/src/main/files/samples/addr/AddressBook.wsdl @@ -214,7 +214,7 @@ _import-1 -wsdl2java-test +generate-test-sources src/test/wsdl/_import/Import.wsdl @@ -242,7 +242,7 @@ _import-2 -wsdl2java-test +generate-test-sources src/test/wsdl/_import/Import.wsdl @@ -284,7 +284,7 @@ _import-3 -wsdl2java-test +generate-test-sources src/test/wsdl/_import/ImportMessagesXSDImport.wsdl @@ -300,7 +300,7 @@ adaptive -wsdl2java-test +generate-test-sources src/test/wsdl/adaptive/adaptive.wsdl @@ -324,7 +324,7 @@ any -wsdl2java-test +generate-test-sources src/test/wsdl/any/any.wsdl @@ -345,7 +345,7 @@ anytype -wsdl2java-test +generate-test-sources
svn commit: r1388171 - in /axis/axis1/java/trunk: axis-rt-transports-http-javanet/ integration/ maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/ samples/echo-sample/ s
Author: veithen
Date: Thu Sep 20 19:33:34 2012
New Revision: 1388171
URL: http://svn.apache.org/viewvc?rev=1388171&view=rev
Log:
Use a reasonable default value for the output directory used by
maven-wsdl2java-plugin.
Modified:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
axis/axis1/java/trunk/samples/echo-sample/pom.xml
axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
axis/axis1/java/trunk/samples/mtomstub-sample/pom.xml
Modified: axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml?rev=1388171&r1=1388170&r2=1388171&view=diff
==
--- axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml Thu Sep 20
19:33:34 2012
@@ -74,7 +74,6 @@
src/test/wsdl/test.wsdl
-
${project.build.directory}/work
true
@@ -129,7 +128,7 @@
${testPort}
-
${project.build.directory}/work
+
${project.build.directory}/generated-test-sources/wsdl2java
**/deploy.wsdd
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388171&r1=1388170&r2=1388171&view=diff
==
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Thu Sep 20 19:33:34 2012
@@ -168,9 +168,6 @@
${project.groupId}
maven-wsdl2java-plugin
${project.version}
-
-${project.build.directory}/work
-
samples-echo
@@ -1186,7 +1183,7 @@
-
${project.build.directory}/work
+
${project.build.directory}/generated-test-sources/wsdl2java
**/deploy.wsdd
@@ -1224,8 +1221,8 @@
-
-
+
+
Modified:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java?rev=1388171&r1=1388170&r2=1388171&view=diff
==
---
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
Thu Sep 20 19:33:34 2012
@@ -68,14 +68,6 @@ public abstract class AbstractWsdl2JavaM
private String url;
/**
- * Output directory for emitted files.
- *
- * @parameter
- * @required
- */
-private File output;
-
-/**
* Add scope to deploy.xml: "Application", "Request", "Session".
*
* @parameter
@@ -200,7 +192,7 @@ public abstract class AbstractWsdl2JavaM
//emitter.setProperties(properties);
//emitter.setImports(!noImports);
emitter.setAllWanted(all);
-emitter.setOutputDir(output.getAbsolutePath());
+emitter.setOutputDir(getSourceOutputDirectory().getAbsolutePath());
emitter.setServerSide(serverSide);
emitter.setSkeleto
svn commit: r1388204 - in /axis/axis1/java/trunk: axis-rt-transports-http-javanet/ integration/ maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/ samples/jaxrpc-sample/
Author: veithen
Date: Thu Sep 20 20:37:48 2012
New Revision: 1388204
URL: http://svn.apache.org/viewvc?rev=1388204&view=rev
Log:
Make the location of the generated deploy.wsdd and undeploy.wsdd files
configurable.
Added:
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
(with props)
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
(with props)
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
(with props)
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
(with props)
Modified:
axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
Modified: axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml?rev=1388204&r1=1388203&r2=1388204&view=diff
==
--- axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-transports-http-javanet/pom.xml Thu Sep 20
20:37:48 2012
@@ -81,6 +81,7 @@
org.apache.axis.transport.http.javanet
+
${project.build.directory}/deploy.wsdd
@@ -128,9 +129,9 @@
${testPort}
-
${project.build.directory}/generated-test-sources/wsdl2java
+
${project.build.directory}
-**/deploy.wsdd
+deploy.wsdd
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1388204&r1=1388203&r2=1388204&view=diff
==
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Thu Sep 20 20:37:48 2012
@@ -232,6 +232,7 @@
test.wsdl.import.binding2
+
${project.build.directory}/wsdd/_import-1.wsdd
@@ -272,6 +273,7 @@
test.import2.messages
+
${project.build.directory}/wsdd/_import-2.wsdd
@@ -316,6 +318,7 @@
test.wsdl.adaptive.types.internal
+
${project.build.directory}/wsdd/adaptive.wsdd
@@ -337,6 +340,7 @@
test.wsdl.any
+
${project.build.directory}/wsdd/any.wsdd
@@ -354,6 +358,7 @@
test.wsdl.anytype
+
${project.build.directory}/wsdd/anytype.wsdd
@@ -372,6 +377,7 @@
test.wsdl.arrays
+
${project.build.directory}/wsdd/arrays.wsdd
@@ -429,6 +435,7 @@
test.wsdl.arrays4
+
${project.build.directory}/wsdd/arrays4.wsdd
@@ -440,6 +447,7 @@
src/test/wsdl/attachments/mime.wsdl
true
true
+
svn commit: r1388344 - /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Author: amilas
Date: Fri Sep 21 06:45:02 2012
New Revision: 1388344
URL: http://svn.apache.org/viewvc?rev=1388344&view=rev
Log:
need to check the namespace as well. since there are some schemas having same
element
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1388344&r1=1388343&r2=1388344&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
Fri Sep 21 06:45:02 2012
@@ -638,6 +638,10 @@ public class SchemaCompiler {
SchemaCompilerMessages.getMessage("schema.elementNull"));
}
+if (xsElt.getName().equals("getUserClaimValuesResponse")){
+System.out.println("Found");
+}
+
//The processing element logic seems to be quite simple. Look at the
relevant schema type
//for each and every element and process that accordingly.
@@ -2833,30 +2837,36 @@ public class SchemaCompiler {
private boolean isComponetExists(XmlSchema schema,
QName componentQName,
int componetType) {
+//first we need to check whether we checking the correct schema.
+if ((schema.getTargetNamespace() != null)
+&&
(!schema.getTargetNamespace().equals(componentQName.getNamespaceURI( {
+return false;
+}
+
boolean isExists = false;
switch (componetType) {
-case COMPONENT_TYPE : {
+case COMPONENT_TYPE: {
isExists =
(schema.getTypeByName(componentQName.getLocalPart()) != null);
break;
}
-case COMPONENT_ELEMENT : {
+case COMPONENT_ELEMENT: {
isExists =
(schema.getElementByName(componentQName.getLocalPart()) != null);
break;
}
-case COMPONENT_ATTRIBUTE : {
+case COMPONENT_ATTRIBUTE: {
isExists = (schema.getAttributes().getItem(componentQName) !=
null);
break;
}
-case COMPONENT_ATTRIBUTE_GROUP : {
+case COMPONENT_ATTRIBUTE_GROUP: {
isExists =
(schema.getAttributeGroups().getItem(componentQName) != null);
break;
}
-case COMPONENT_GROUP : {
+case COMPONENT_GROUP: {
isExists = (schema.getGroups().getItem(componentQName) !=
null);
break;
}
}
- return isExists;
+return isExists;
}
public Map getLoadedSchemaMap(){
