svn commit: r922805 - in /axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin: pom.xml src/test/java/test/MyClass.java src/test/java/test/Service.java

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 10:22:37 2010
New Revision: 922805

URL: http://svn.apache.org/viewvc?rev=922805&view=rev
Log:
Java2WSDL Ant task: added a test for package-namespace mappings.

Added:

axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
   (with props)
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml

axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/Service.java

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=922805&r1=922804&r2=922805&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Sun Mar 14 
10:22:37 2010
@@ -126,6 +126,8 @@
 
 
 
+
+
 
@@ -144,6 +146,15 @@
extraClasses="test.ExtraClass1">
 
 
+
+
+
+http://www.example.org/schema/test-service";>
+http://www.example.org/schema/test"/>
+
 
 
 
@@ -167,12 +178,21 @@
 def wsdl = new 
Namespace('http://schemas.xmlsoap.org/wsdl/')
 def xs = new 
Namespace('http://www.w3.org/2001/XMLSchema')
 
+println 'Checking extraclasses*.wsdl'
+
 for (i in 1..3) {  
  
 def wsdlDoc = parser.parse(new 
File(project.build.directory, "java2wsdl/extraclasses${i}.wsdl"))
 def complexTypes = 
wsdlDoc[wsdl.types][xs.schema][xs.complexType].'@name'
 assert complexTypes.contains('ExtraClass1')
 assert complexTypes.contains('ExtraClass2')
 }
+
+println 'Checking mappings.wsdl'
+
+def wsdlDoc = parser.parse(new 
File(project.build.directory, "java2wsdl/mappings.wsdl"))
+def namespaces = 
wsdlDoc[wsdl.types][xs.schema].'@targetNamespace'
+assert 
namespaces.contains('http://www.example.org/schema/test-service')
+assert 
namespaces.contains('http://www.example.org/schema/test')
 
 
 

Added: 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java?rev=922805&view=auto
==
--- 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
 (added)
+++ 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
 Sun Mar 14 10:22:37 2010
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package test;
+
+public class MyClass {
+private String property;
+
+public String getProperty() {
+return property;
+}
+
+public void setProperty(String property) {
+this.property = property;
+}
+}

Propchange: 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
--

svn commit: r922818 - /axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 11:46:17 2010
New Revision: 922818

URL: http://svn.apache.org/viewvc?rev=922818&view=rev
Log:
java2wsdl command line tool: added a test for the -p2n option.

Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml

Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=922818&r1=922817&r2=922818&view=diff
==
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Sun Mar 14 11:46:17 
2010
@@ -71,6 +71,13 @@
 xalan
 test
 
+
+
+org.apache.axis2
+axis2-adb
+${version}
+test
+
 
 
 src
@@ -119,6 +126,64 @@
 
 
 
+
+maven-antrun-plugin
+
+
+
+run
+
+test
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.example.org/calculator]"/>
+
+http://www.example.org/calculator-service"/>
+
+
+
+
+
+
+
+org.codehaus.groovy.maven
+gmaven-plugin
+1.0
+
+
+test
+
+execute
+
+
+
+import groovy.xml.*
+
+def parser = new XmlParser()
+def wsdl = new 
Namespace('http://schemas.xmlsoap.org/wsdl/')
+def xs = new 
Namespace('http://www.w3.org/2001/XMLSchema')
+
+println 'Checking p2n.wsdl'
+
+def wsdlDoc = parser.parse(new 
File(project.build.directory, "java2wsdl/p2n.wsdl"))
+def namespaces = 
wsdlDoc[wsdl.types][xs.schema].'@targetNamespace'
+assert 
namespaces.contains('http://www.example.org/calculator')
+assert 
namespaces.contains('http://www.example.org/calculator-service')
+
+
+
+
+
 
 
 




svn commit: r922828 - /axis/axis2/java/core/trunk/modules/kernel/pom.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 12:33:22 2010
New Revision: 922828

URL: http://svn.apache.org/viewvc?rev=922828&view=rev
Log:
Using resources:testResources to copy files to a location outside of 
target/test-classes is a bad practice. Use antrun to copy files instead. With 
this change, eclipse:eclipse will generate an Eclipse project that can be build 
correctly.

Modified:
axis/axis2/java/core/trunk/modules/kernel/pom.xml

Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=922828&r1=922827&r2=922828&view=diff
==
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Sun Mar 14 12:33:22 2010
@@ -117,13 +117,6 @@
 
 
 
-../test-resources
-test-resources
-
-**/**
-
-
-
 
test-resources/deployment/ClasspathModule
 
 **/**
@@ -198,6 +191,9 @@
 process-test-resources
 
 
+
+
+
 
 

svn commit: r922830 - /axis/axis2/java/core/trunk/modules/kernel/

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 12:37:07 2010
New Revision: 922830

URL: http://svn.apache.org/viewvc?rev=922830&view=rev
Log:
Setting up svn:ignore for Eclipse.

Modified:
axis/axis2/java/core/trunk/modules/kernel/   (props changed)

Propchange: axis/axis2/java/core/trunk/modules/kernel/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 12:37:07 2010
@@ -2,3 +2,6 @@
 target
 bin
 *.iml
+.settings
+.classpath
+.project





svn commit: r922906 - /axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 17:35:54 2010
New Revision: 922906

URL: http://svn.apache.org/viewvc?rev=922906&view=rev
Log:
axis2-fastinfoset module: let Maven compile the generated test sources instead 
of using the javac task in antrun. This solves AXIS2-4652 and is necessary to 
import the project into Eclipse with maven-eclipse-plugin.

Modified:
axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml

Modified: axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=922906&r1=922905&r2=922906&view=diff
==
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Sun Mar 14 17:35:54 
2010
@@ -202,12 +202,6 @@
 
 
 
-
-
-
-
-
-
 
 
 
@@ -217,6 +211,24 @@
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+add-test-source
+generate-test-sources
+
+add-test-source
+
+
+
+
${project.build.directory}/wsdl/simpleAddService
+
+
+
+
+
+
 maven-surefire-plugin
 true
 




svn commit: r922914 - /axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 17:52:04 2010
New Revision: 922914

URL: http://svn.apache.org/viewvc?rev=922914&view=rev
Log:
Use maven-remote-resources-plugin to copy legal files (see also r777934).

Modified:
axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml

Modified: axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml?rev=922914&r1=922913&r2=922914&view=diff
==
--- axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml Sun Mar 14 
17:52:04 2010
@@ -39,15 +39,23 @@
 
 
 
-
-
-../../..
-
-NOTICE.txt
-LICENSE.txt
-
-false
-
-
+
+
+maven-remote-resources-plugin
+
+
+legal-files
+
+process
+
+
+
+
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
+
+
+
+
+
 
 




svn commit: r922936 - /axis/axis2/java/core/trunk/modules/codegen/pom.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 19:56:51 2010
New Revision: 922936

URL: http://svn.apache.org/viewvc?rev=922936&view=rev
Log:
Fixed formatting.

Modified:
axis/axis2/java/core/trunk/modules/codegen/pom.xml

Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=922936&r1=922935&r2=922936&view=diff
==
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Sun Mar 14 19:56:51 2010
@@ -33,27 +33,27 @@
 Axis2 Code Generation module
 
 
-  ${project.groupId}
-  axis2-kernel
-  ${project.version}
+${project.groupId}
+axis2-kernel
+${project.version}
+
+
+${project.groupId}
+axis2-adb
+${project.version}
+
+
+${project.groupId}
+axis2-transport-local
+${project.version}
+test
+
+
+${project.groupId}
+axis2-transport-http
+${project.version}
+test
 
-  
-${project.groupId}
-axis2-adb
-${project.version}
-  
-  
-${project.groupId}
-axis2-transport-local
-${project.version}
-test
-  
-  
-${project.groupId}
-axis2-transport-http
-${project.version}
-test
-  
 
 
 src
@@ -122,63 +122,63 @@
 
 
 
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-true
-
-  
-**/*Test.java
-  
-
-  
+
+org.apache.maven.plugins
+maven-surefire-plugin
+true
+
+
+**/*Test.java
+
+
+
 
-  
-org.apache.maven.plugins
+
+org.apache.maven.plugins
 maven-antrun-plugin
 
-  
-generate-test-sources
-generate-test-sources
-
-  
-
-
-Building WSDLs...
-
-
-
-  
-
-
-  
-
-
-  run
-
-  
-  
-process-resources
-process-resources
-
-  
-
-  
-
-
-  
-  
-
-
-  
-
-  
-
-
-  run
-
-  
+
+generate-test-sources
+generate-test-sources
+
+
+
+
+Building WSDLs...
+
+
+
+
+
+
+
+
+
+run
+
+
+
+process-resources
+process-resources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+run
+
+
 
 
 




svn commit: r922941 - in /axis/axis2/java/core/trunk/modules: codegen/pom.xml parent/pom.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 20:18:17 2010
New Revision: 922941

URL: http://svn.apache.org/viewvc?rev=922941&view=rev
Log:
Codegen tests: use a staging approach to copy the templates from the other 
projects. This allows the maven-eclipse-plugin to work properly (Eclipse 
doesn't support source folders located outside of the project directory).

Modified:
axis/axis2/java/core/trunk/modules/codegen/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml

Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=922941&r1=922940&r2=922941&view=diff
==
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Sun Mar 14 20:18:17 2010
@@ -81,28 +81,7 @@
 
 
 
-../adb-codegen/src
-
-**/*.xsl
-
-
-
-../xmlbeans/src
-
-**/*.xsl
-
-
-
-../jaxbri/src
-
-**/*.xsl
-
-
-
-../jibx/src
-
-**/*.xsl
-
+${project.build.directory}/templates
 
 
 
@@ -181,6 +160,53 @@
 
 
 
+
+maven-resources-plugin
+
+
+
+copy-templates
+generate-test-resources
+
+copy-resources
+
+
+
${project.build.directory}/templates
+  
+
+../adb-codegen/src
+
+**/*.xsl
+
+
+
+../xmlbeans/src
+
+**/*.xsl
+
+
+
+../jaxbri/src
+
+**/*.xsl
+
+
+
+../jibx/src
+
+**/*.xsl
+
+
+  
+
+
+
+
 
 
 

Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=922941&r1=922940&r2=922941&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Mar 14 20:18:17 2010
@@ -1254,7 +1254,7 @@
 
 
 maven-resources-plugin
-2.2
+2.4.2
 
 
 maven-site-plugin




svn commit: r922967 - in /axis/axis2/java/core/trunk/modules/integration: itest-build.xml pom.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 21:29:56 2010
New Revision: 922967

URL: http://svn.apache.org/viewvc?rev=922967&view=rev
Log:
Integration tests: let Maven invoke the compiler (instead of using Ant). This 
allows maven-eclipse-plugin to import the generated sources into the Eclipse 
project.

Modified:
axis/axis2/java/core/trunk/modules/integration/itest-build.xml
axis/axis2/java/core/trunk/modules/integration/pom.xml

Modified: axis/axis2/java/core/trunk/modules/integration/itest-build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/itest-build.xml?rev=922967&r1=922966&r2=922967&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/itest-build.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/itest-build.xml Sun Mar 14 
21:29:56 2010
@@ -47,11 +47,6 @@



-   
-   
-   
-   
-   
 
Compiling DocumentUnwrappingTest.wsdl

@@ -81,16 +76,11 @@



-   
-   
-   
-   
-   
 



-   
+   

 


Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=922967&r1=922966&r2=922967&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sun Mar 14 21:29:56 
2010
@@ -303,6 +303,9 @@
 **/*.properties
 
 
+
+
${project.build.directory}/xmlbeans/resources
+
 
 
 
@@ -365,6 +368,26 @@
 
 
 
+
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+add-test-source
+process-test-resources
+
+add-test-source
+
+
+
+
${project.build.directory}/wsdl/complexdatatype/src
+
${project.build.directory}/wsdl/complexdatatypebare/src
+
${project.build.directory}/xmlbeans/java
+
+
+
+
+
 
 
 




svn commit: r922971 - in /axis/axis2/java/core/trunk/modules: adb-codegen/ adb/ addressing/ clustering/ codegen/ corba/ fastinfoset/ integration/ java2wsdl/ jaxbri/ jaxws-integration/ jaxws-mar/ jibx/

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 21:52:11 2010
New Revision: 922971

URL: http://svn.apache.org/viewvc?rev=922971&view=rev
Log:
Set up svn:ignore for Eclipse.

Modified:
axis/axis2/java/core/trunk/modules/adb/   (props changed)
axis/axis2/java/core/trunk/modules/adb-codegen/   (props changed)
axis/axis2/java/core/trunk/modules/addressing/   (props changed)
axis/axis2/java/core/trunk/modules/clustering/   (props changed)
axis/axis2/java/core/trunk/modules/codegen/   (props changed)
axis/axis2/java/core/trunk/modules/corba/   (props changed)
axis/axis2/java/core/trunk/modules/fastinfoset/   (props changed)
axis/axis2/java/core/trunk/modules/integration/   (props changed)
axis/axis2/java/core/trunk/modules/java2wsdl/   (props changed)
axis/axis2/java/core/trunk/modules/jaxbri/   (props changed)
axis/axis2/java/core/trunk/modules/jaxws-integration/   (props changed)
axis/axis2/java/core/trunk/modules/jaxws-mar/   (props changed)
axis/axis2/java/core/trunk/modules/jibx/   (props changed)
axis/axis2/java/core/trunk/modules/json/   (props changed)
axis/axis2/java/core/trunk/modules/metadata/   (props changed)
axis/axis2/java/core/trunk/modules/mex/   (props changed)
axis/axis2/java/core/trunk/modules/mtompolicy/   (props changed)
axis/axis2/java/core/trunk/modules/mtompolicy-mar/   (props changed)
axis/axis2/java/core/trunk/modules/osgi/   (props changed)
axis/axis2/java/core/trunk/modules/ping/   (props changed)
axis/axis2/java/core/trunk/modules/resource-bundle/   (props changed)
axis/axis2/java/core/trunk/modules/scripting/   (props changed)
axis/axis2/java/core/trunk/modules/soapmonitor/module/   (props changed)
axis/axis2/java/core/trunk/modules/soapmonitor/servlet/   (props changed)
axis/axis2/java/core/trunk/modules/spring/   (props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/   (props 
changed)
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/   (props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/   (props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/   
(props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/   (props 
changed)
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/   
(props changed)
axis/axis2/java/core/trunk/modules/webapp/   (props changed)
axis/axis2/java/core/trunk/modules/xmlbeans/   (props changed)

Propchange: axis/axis2/java/core/trunk/modules/adb/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 *.iml
 target
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/adb-codegen/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 *.iml
 target
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/addressing/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,3 +1,6 @@
 *.log
 target
 *.iml
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/clustering/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,3 +1,5 @@
 axis2-clustering.iml
 target
-
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/codegen/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 *.iml
 target
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/corba/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,3 +1,5 @@
 target
 *.iml
-
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/fastinfoset/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -2,3 +2,6 @@ test.bin
 output.xml
 target
 axis2-fastinfoset.iml
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/integration/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 target
 axis2-integration.iml
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/java2wsdl/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 *.iml
 target
+.settings
+.classpa

svn commit: r922983 - /axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 22:17:47 2010
New Revision: 922983

URL: http://svn.apache.org/viewvc?rev=922983&view=rev
Log:
Use maven-remote-resources-plugin to copy legal files (see also r777934).

Modified:
axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml

Modified: axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml?rev=922983&r1=922982&r2=922983&view=diff
==
--- axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml Sun Mar 14 
22:17:47 2010
@@ -45,21 +45,24 @@
 
 
 
-
-
-src/main/resources
-
-
-../../..
-
-NOTICE.txt
-LICENSE.txt
-
-false
-
-
 
 
+maven-remote-resources-plugin
+
+
+legal-files
+
+process
+
+
+
+
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
+
+
+
+
+
 org.apache.axis2
 axis2-mar-maven-plugin
 ${mar.plugin.version}




svn commit: r922997 - /axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 22:59:46 2010
New Revision: 922997

URL: http://svn.apache.org/viewvc?rev=922997&view=rev
Log:
Made svn.xml a real XDOC document and cleaned up the formatting.

Modified:
axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

Modified: axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml?rev=922997&r1=922996&r2=922997&view=diff
==
--- axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml (original)
+++ axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml Sun Mar 14 
22:59:46 2010
@@ -1,3 +1,4 @@
+
 
-
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-http://www.w3.org/1999/xhtml";>
-
-
-
-Developing Apache Axis2
-
-
-
-Developing Apache Axis2
-This document provides information on how to use SVN to get an
-SVN checkout/update, make commits to the repository, etc., in the
-process of contributing to Apache projects (specifically Axis2).
-Instructions on configuring IDEs for development and using Maven to
-build the project is also included here.
-Content
-
-Working with Subversion (SVN)
-Checkout Axis2 from Subversion
-Installing Maven 2
-Configuring your IDE
-
-
-Working with Subversion (SVN)
-The Axis2 development team uses Subversion (SVN) for source
-control. Subversion is a compelling replacement for CVS, developed
-under the auspices of the Tigris community and licensed under an
-Apache compatible license. To learn more about Subversion or to
-download the latest distribution, visit the http:///subversion.tigris.org"; target="_blank">Subversion project
-site. If you are looking for guidance on setting up and
-installing Subversion, please read the ASF http://www.apache.org/dev/version-control.html"; target=
-"_blank">Source Code Repositories page.
-
-Checkout Axis2 from Subversion
-To check out the latest version of Axis2 from the Foundation's
-Subversion repository, you must use one of the following URLs
-depending on your level of access to the Axis2 source code:
-
-If you are not a committer: http://svn.apache.org/repos/asf/webservices/axis2/trunk/java";
-target=
-"_blank">http://svn.apache.org/repos/asf/webservices/axis2/trunk/java
-If you are a committer: https://svn.apache.org/repos/asf/webservices/axis2/trunk/java";
-target=
-"_blank">https://svn.apache.org/repos/asf/webservices/axis2/trunk/java
-
-If you are a committer, make sure that you have selected an
-svnpasswd. To do this, you must log into svn.apache.org. For more
-information, please read the ASF http://www.apache.org/dev/version-control.html"; target=
-"_blank">Source Code Repositories page.
-Once you have successfully installed Subversion, you can check
-out Axis2 trunk by following these steps:
-
-Run svn co  axis2 where
-the repository URL is one of the URLs from the previous list.
-This step will check out the latest version of the Axis2 Java
-codebase to a directory named "axis2". The second parameter to the
-svn co selects a directory to create on your local
-machine. If you want to checkout Axis2 to a different directory,
-feel free to change axis2 to any other directory name.
-To update your working copy to the latest version from the
-repository, execute the svn update command.
-If you would like to submit a patch, you can execute
-svn diff to create a unified diff for submission
-to the Axis2 JIRA issue tracker.
-
-
-Installing Maven 2
-Axis2's build is based on Maven 2. Maven is a build system that
-allows for the reuse of common build projects across multiple
-projects. For information about obtaining, installing, and
-configuring Maven 2, please see the http://maven.apache.org"; target="_blank">Maven project page.
-To use Maven to build the Axis2 project, Please install http://maven.apache.org/download.html"; target=
-"_blank">Maven2 and follow instructions here -  Quick Guide to Maven for Axis 2.0.
-
-Configuring your IDE
-The Axis2 development team uses a variety of development tools
-from vi to emacs to eclipse to Intellij/IDEA. The following section
-is not an endorsement of a specific set of tools, it is simply
-meant as a pointer to ease the process of getting started with
-Axis2 development.
-
-Intellij IDEA - type mvn
-idea:idea. Generates the necessary IDEA .ipr, .iml
-and .iws project files
-Eclipse- type mvn eclipse:eclipse. Then 
in Eclipse, setup a Classpath Variable
-for MAVEN_REPO, and select File > Import > Existing Projects
-into Workspace > Select root directory. Selecting the root of
-the Axis source discovers all the modules and allows them to be
-imported as individual projects at once.
-
-
-
+http://maven.apache.org/XDOC/2.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+
+Developing Apac

svn commit: r923005 - /axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

2010-03-14 Thread veithen
Author: veithen
Date: Sun Mar 14 23:24:22 2010
New Revision: 923005

URL: http://svn.apache.org/viewvc?rev=923005&view=rev
Log:
Updated the instructions for import of the Axis2 sources into Eclipse.

Modified:
axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

Modified: axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml?rev=923005&r1=923004&r2=923005&view=diff
==
--- axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml (original)
+++ axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml Sun Mar 14 
23:24:22 2010
@@ -99,21 +99,61 @@
 
 
 The Axis2 development team uses a variety of development tools
-from vi to emacs to eclipse to Intellij/IDEA. The following 
section
+from vi to emacs to Eclipse to Intellij/IDEA. The following 
section
 is not an endorsement of a specific set of tools, it is simply
 meant as a pointer to ease the process of getting started with
 Axis2 development.
 
-
-Intellij IDEA - type mvn
-idea:idea. Generates the necessary IDEA .ipr, .iml
-and .iws project files
-Eclipse- type mvn 
eclipse:eclipse. Then in Eclipse, setup a Classpath Variable
-for MAVEN_REPO, and select File > Import > Existing 
Projects
-into Workspace > Select root directory. Selecting the root 
of
-the Axis source discovers all the modules and allows them to be
-imported as individual projects at once.
-
+
+
+Type mvn idea:idea. Generates the 
necessary IDEA .ipr, .iml
+and .iws project files.
+
+
+
+
+We recommend using http://maven.apache.org/plugins/maven-eclipse-plugin/";>maven-eclipse-plugin
+to import the Axis2 sources into Eclipse. This works best 
with the following
+combinations of versions and settings:
+
+
+
+Early versions of Maven 2 have issues with non 
standard packagings
+(bundle, aar and mar in the 
case of Axis2)
+in multi-module builds. While this has no impact on 
the normal Maven
+build, it prevents the Maven Eclipse plugin from 
identifying modules
+with these packagings as Java projects. Therefore it 
is recommended
+to use Maven 2.2.x to execute the Maven Eclipse plugin.
+
+
+By default, the Maven Eclipse plugin only imports 
generated sources
+and resources created during the 
generate-sources and
+generate-resources phases, but fails to 
locate them if they
+are generated during the 
generate-test-sources and
+generate-test-resources phases. This is due 
to a limitation in Maven 2 (see
+http://jira.codehaus.org/browse/MECLIPSE-37";>MECLIPSE-37
+for more information). Therefore it is recommended to 
execute the
+eclipse:eclipse goal after the 
process-test-resources
+phase.
+
+
+There is a bug in the Maven Eclipse plugin version 2.8 
that causes
+it to fail on the Axis2 sources. However, version 2.7 
is known to work.
+
+
+
+To summarize, use the following command to prepare the 
Axis2 sources for
+import into Eclipse:
+
+mvn process-test-resources 
org.apache.maven.plugins:maven-eclipse-plugin:2.7:eclipse
+
+As usual, before importing the projects into Eclipse, 
check that a Classpath Variable
+for M2_REPO is configured in Eclipse. Then select 
File > Import > Existing Projects
+into Workspace > Select root directory. Selecting the 
root of
+the Axis source discovers all the modules and allows them 
to be
+imported as individual projects at once.
+
+