svn commit: r1229939 - /axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java

2012-01-11 Thread sagara
Author: sagara
Date: Wed Jan 11 09:34:43 2012
New Revision: 1229939

URL: http://svn.apache.org/viewvc?rev=1229939&view=rev
Log:
Removed debug codes. 

Modified:

axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java

Modified: 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java?rev=1229939&r1=1229938&r2=1229939&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
 Wed Jan 11 09:34:43 2012
@@ -252,8 +252,6 @@ public class RepoHelper {
  * directory mentioned copy content else copy
  * target/articaft-version.jar file to the repo.
  */
-System.out.println(" = " + serviceJarLocation + ":"
-+ jaxwsServiceSrcDir);
 File srcFile;
 File disFile = new File(jaxwsServiceDir
 + 
serviceJarLocation.substring(serviceJarLocation.lastIndexOf(File.separator)));




svn commit: r1229940 - in /axis/axis1/java/trunk: docs/integration-guide.html src/site/xdoc/integration-guide.xml

2012-01-11 Thread veithen
Author: veithen
Date: Wed Jan 11 09:39:44 2012
New Revision: 1229940

URL: http://svn.apache.org/viewvc?rev=1229940&view=rev
Log:
Migrated the Integration Guide to XDoc.

Added:
axis/axis1/java/trunk/src/site/xdoc/integration-guide.xml
  - copied, changed from r1229765, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/integration-guide.xml
Removed:
axis/axis1/java/trunk/docs/integration-guide.html

Copied: axis/axis1/java/trunk/src/site/xdoc/integration-guide.xml (from 
r1229765, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/integration-guide.xml)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/integration-guide.xml?p2=axis/axis1/java/trunk/src/site/xdoc/integration-guide.xml&p1=webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/integration-guide.xml&r1=1229765&r2=1229940&rev=1229940&view=diff
==
--- 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/integration-guide.xml
 (original)
+++ axis/axis1/java/trunk/src/site/xdoc/integration-guide.xml Wed Jan 11 
09:39:44 2012
@@ -1,43 +1,37 @@
 
-
-
-  
-WebServices - Axis
-  
+
+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";>
+  
+Integration Guide
+  
   
 
-
-
-Axis System Integration Guide
-
-1.2 Version
-Feedback: mailto:axis-...@ws.apache.org";>axis-...@ws.apache.org
+
 
-
-
-Table of Contents
-
-
-  Introduction
-  Pluggable APIs
-  
-Components
-Logging/Tracing
-Configuration
-Handlers
-Internationalization
-Performance Monitoring
-Encoding
-WSDL Parser and Code 
Generator Framework
-  
-  Client SSL
-
+
 
 
 
-
-
-Introduction
+
 
 The primary purpose of this guide is to present how Axis can be integrated 
into an existing web application server, such as Tomcat or WebSphere, for 
example. Axis has a number of Pluggable APIs that are necessary for such an 
integration.
 
@@ -45,20 +39,15 @@
 
 
 
-
-
-Pluggable APIs
+
 
 The following are the points that are pluggable in order to integrate Axis 
into a web application server. The first subsection details a number of 
pluggable components in general. More details are provided for other components 
in the remaining subsections.
 
-
-
-Components
+
 
 This section describes in general how to plug specializations of various 
components into Axis.
 
-
-General Strategy
+General Strategy
 
 To override the default behavior for a pluggable component:
 
@@ -86,10 +75,7 @@
   Package the implementation class and, if used, the service definition 
file in a JAR file and/or place it where it can be picked up by a class loader 
(CLASSPATH).
 
 
-
-
-
-Example 1
+Example 1
 
 To override the default behavior for the Java Compiler:
 
@@ -102,10 +88,7 @@
   Since org.apache.axis.components.compiler.Jikes is packaged 
with Axis, all that needs to be done is to ensure that the service definition 
file is loadable by a class loader.
 
 
-
-
-
-Example 2
+Example 2
 
 To override the default behavior for the SocketFactory in an environment 
that does not allow resources to be located/loaded appropriately, or where the 
behavior needs to be forced to a specific implementation:
 
@@ -120,17 +103,14 @@
   Ensure that the implementation class is loadable by a class loader.
 
 
-
-
-
-Reference
+Reference
 
 (Component/Package: org.apache.axis.components.*)
 
 
 
 
-  Component Package
+  Component/Package
   Factory
   Interface
   Optional System Property
@@ -139,7 +119,7 @@
 
 
   compiler
-  CompilerFactory getCompiler()
+  CompilerFactory.getCompiler()
   Compiler
   axis.Compiler
   Javac
@@ -147,7 +127,7 @@
 
 
   image
-  ImageIOFactory getImageIO()
+  ImageIOFactory.getImageIO()
   ImageIO
   axis.ImageIO
   MerlinIO, JimiIO, JDK13IO
@@ -155,7 +135,7 @@
 
 
   jms
-  JMSVendorAdapterFactory getJMSVendorAdapter()
+  JMSVendorAdapterFactory.getJMSVendorAdapter()
   JMSVendorAdapter
   
   JNDIVendorAdapter
@@ -163,7 +143,7 @@
 
 
   net
-  SocketFactoryFactory getFactory()
+  SocketFactoryFactory.getFactory()
   SocketFactory
   axis.socketFactory
   DefaultSocketFactory
@@ -171,7 +151,7 @@
 
 
   net
-  SocketFactoryFactory getSecureFactory()
+  SocketFactoryFactory.getSecureFactory()
   SecureSocketFactory
   axis.socketSecureFactory
   JSSESocketFactory
@@ -196,25 +176,17 @@ What points are necessary to manage Axis
 
 -->
 
-
-
-
+
 
-
-
-Logging/Tracing
+
 
 Axis logging and tracing is based on the Logging component of the http://jakarta.apache.org/commons/index.html";>Jakarta Commons 
project, or the Jakarta Commons Logging (JCL) SPI. The JCL provides a Log 
interface with thin-wrapper implementations for other logging tools, including 
http://jakarta.apache.org/log4j/docs/index.html";>Log4J, http://jakarta.apache.org/aval

svn commit: r1229944 - in /axis/axis2/java/core/trunk/modules/tool/archetype: ./ quickstart/ quickstart/src/ quickstart/src/main/ quickstart/src/main/resources/ quickstart/src/main/resources/META-INF/

2012-01-11 Thread sagara
Author: sagara
Date: Wed Jan 11 09:54:41 2012
New Revision: 1229944

URL: http://svn.apache.org/viewvc?rev=1229944&view=rev
Log:
Added new module for AXIS2-5229. 

Added:
axis/axis2/java/core/trunk/modules/tool/archetype/
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml   
(with props)
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/META-INF/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/META-INF/maven/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/META-INF/maven/archetype.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/pom.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/java/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/java/SimpleService.java
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/resources/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/resources/modules/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/resources/services/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/resources/services/SimpleService/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/resources/services/SimpleService/META-INF/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/main/resources/services/SimpleService/META-INF/services.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/test/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/archetype-resources/src/test/java/

Added: axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml?rev=1229944&view=auto
==
--- axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml (added)
+++ axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml Wed 
Jan 11 09:54:41 2012
@@ -0,0 +1,54 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+   4.0.0
+   
+   org.apache.axis2
+   axis2-parent
+   1.7.0-SNAPSHOT
+   ../../../parent/pom.xml
+   
+   org.apache.axis2.archetype
+   quickstart
+   1.7.0-SNAPSHOT
+   maven-archetype
+   Axis2 quickstart archetype 
+   Maven archetype for creating a  Axis2 web Service 

+
+   
+   
+   
+   src/main/resources
+   true
+   
+   
+
+   
+   
+   org.apache.maven.archetype
+   archetype-packaging
+   2.1
+   
+   
+   
+
\ No newline at end of file

Propchange: axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml
--
svn:eol-style = native

Added: 
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1229944&view=auto
==

svn commit: r1229945 - /axis/axis2/java/core/trunk/modules/parent/pom.xml

2012-01-11 Thread sagara
Author: sagara
Date: Wed Jan 11 09:56:28 2012
New Revision: 1229945

URL: http://svn.apache.org/viewvc?rev=1229945&view=rev
Log:
maven-archetype-plugin added for AXIS2-5229.

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

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=1229945&r1=1229944&r2=1229945&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Wed Jan 11 09:56:28 2012
@@ -105,6 +105,7 @@
 1.1
 2.0.7
 
2.0.7
+2.2
 2.4
 1.4.9
 1.6R7
@@ -791,6 +792,11 @@
 ${maven.plugin.descriptor.version}
 
 
+   org.apache.maven.plugins
+   maven-archetype-plugin
+${maven.archetype.plugin.version}
+
+
 org.codehaus.plexus
 plexus-utils
 ${plexus.utils.version}




svn commit: r1229946 - /axis/axis1/java/trunk/src/site/xdoc/releases.xml

2012-01-11 Thread veithen
Author: veithen
Date: Wed Jan 11 09:56:44 2012
New Revision: 1229946

URL: http://svn.apache.org/viewvc?rev=1229946&view=rev
Log:
Migrated releases.xml to XDoc.

Added:
axis/axis1/java/trunk/src/site/xdoc/releases.xml
  - copied, changed from r1229943, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/releases.xml

Copied: axis/axis1/java/trunk/src/site/xdoc/releases.xml (from r1229943, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/releases.xml)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/releases.xml?p2=axis/axis1/java/trunk/src/site/xdoc/releases.xml&p1=webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/releases.xml&r1=1229943&r2=1229946&rev=1229946&view=diff
==
--- 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/releases.xml
 (original)
+++ axis/axis1/java/trunk/src/site/xdoc/releases.xml Wed Jan 11 09:56:44 2012
@@ -1,18 +1,33 @@
-
-
-
-
-  
-WebServices - Axis
-  
+
+
+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";>
+  
+Releases
+  
   
 
-
-
-Releases
+
 
-
-
+

 Name
 Date
@@ -139,7 +154,6 @@
 First Alpha release
   
 
-
 
 For nightly builds, see the Interim Drops 
page.
 




svn commit: r1229947 - /axis/axis2/java/core/trunk/pom.xml

2012-01-11 Thread sagara
Author: sagara
Date: Wed Jan 11 10:00:20 2012
New Revision: 1229947

URL: http://svn.apache.org/viewvc?rev=1229947&view=rev
Log:
Added new module for AXIS2-5229.

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

Modified: axis/axis2/java/core/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1229947&r1=1229946&r2=1229947&view=diff
==
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Wed Jan 11 10:00:20 2012
@@ -69,6 +69,7 @@
 modules/tool/axis2-repo-maven-plugin
 modules/tool/axis2-wsdl2code-maven-plugin
 modules/tool/simple-server-maven-plugin
+modules/tool/archetype/quickstart
 modules/webapp
 modules/xmlbeans
 modules/scripting




svn commit: r1229950 - /axis/axis1/java/trunk/src/site/xdoc/releases.xml

2012-01-11 Thread veithen
Author: veithen
Date: Wed Jan 11 10:30:25 2012
New Revision: 1229950

URL: http://svn.apache.org/viewvc?rev=1229950&view=rev
Log:
Removed links to alpha/beta releases and RCs.

Modified:
axis/axis1/java/trunk/src/site/xdoc/releases.xml

Modified: axis/axis1/java/trunk/src/site/xdoc/releases.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/releases.xml?rev=1229950&r1=1229949&r2=1229950&view=diff
==
--- axis/axis1/java/trunk/src/site/xdoc/releases.xml (original)
+++ axis/axis1/java/trunk/src/site/xdoc/releases.xml Wed Jan 11 10:30:25 2012
@@ -54,105 +54,15 @@
 Final Version 1.2
   
   
-http://www.apache.org/dyn/closer.cgi/ws/axis/1_2RC3/";>1.2RC3
-March 1, 2005
-Release Candidate #3 for version 1.2
-  
-  
-http://archive.apache.org/dist/ws/axis/1_2RC2/";>1.2RC2
-November 17, 2004
-Release Candidate #2 for version 1.2
-  
-  
-http://archive.apache.org/dist/ws/axis/1_2RC1/";>1.2RC1
-September 30, 2004
-Release Candidate #1 for version 1.2
-  
-  
-http://archive.apache.org/dist/ws/axis/1_2beta3/";>1.2beta3
-August 17, 2004
-Third beta release for version 1.2
-  
-  
-http://archive.apache.org/dist/ws/axis/1_2beta2/";>1.2beta2
-July 14, 2004
-Second beta release for version 1.2
-  
-  
-http://archive.apache.org/dist/ws/axis/1_2beta/";>1.2beta1
-April 1, 2004
-First beta release for version 1.2
-  
-  
-http://archive.apache.org/dist/ws/axis/1_2alpha/";>1.2alpha
-December 1, 2003
-Alpha Version 1.2
-  
-  
 http://ws.apache.org/axis/download.cgi";>1.1 (from 
mirror)
 June 16, 2003
 Final Version 1.1
   
-  
-http://archive.apache.org/dist/ws/axis/1_1rc2";>1.1rc2
-March 5, 2003
-Release Candidate #2 for version 1.1
-  
-  
-http://archive.apache.org/dist/ws/axis/1_1RC1";>1.1rc1
-February 9, 2003
-Release Candidate #1 for version 1.1
-  
-  
-http://archive.apache.org/dist/ws/axis/1_1beta";>1.1beta
-December 3, 2002
-Beta for 1.1 release
-  

 http://archive.apache.org/dist/ws/axis/1_0/";>1.0
 October 7, 2002
 Release 1.0
   
-   
-http://archive.apache.org/dist/ws/axis/1_0rc2/";>1.0rc2
-September 30, 2002
-Release Candidate #2 for version 1.0
-  
-   
-http://archive.apache.org/dist/ws/axis/1_0rc1/";>1.0rc1
-September 6, 2002
-Release Candidate #1 for version 1.0
-  
-   
-http://archive.apache.org/dist/ws/axis/beta3/";>Beta 3
-July 9, 2002
-Third beta release (changes since beta 
2)
-  
-   
-http://archive.apache.org/dist/ws/axis/beta2/";>Beta 2
-April 29, 2002
-Second beta release (changes since beta 
1)
-  
-   
-http://archive.apache.org/dist/ws/axis/beta1/";>Beta 1
-March 15, 2002
-First beta release.
-  
-   
-http://archive.apache.org/dist/ws/axis/alpha3";>Alpha 
3
-December 14, 2001
-Third Alpha - add JAX RPC, WSDD, more WSDL functionallity, etc.
-  
-   
-http://archive.apache.org/dist/ws/axis/alpha2";>Alpha 
2
-September 21, 2001
-Second Alpha - add WSDL functionality, many bug fixes
-  
-   
-http://archive.apache.org/dist/ws/axis/alpha1";>Alpha 
1
-August 15, 2001
-First Alpha release
-  
 
 
 For nightly builds, see the Interim Drops 
page.




svn commit: r1229951 - /axis/axis1/java/trunk/src/site/xdoc/releases.xml

2012-01-11 Thread veithen
Author: veithen
Date: Wed Jan 11 10:36:25 2012
New Revision: 1229951

URL: http://svn.apache.org/viewvc?rev=1229951&view=rev
Log:
AXIS-2565 / AXIS-2609 / AXIS-2642 / AXIS-2717: Fixed broken download links.

Modified:
axis/axis1/java/trunk/src/site/xdoc/releases.xml

Modified: axis/axis1/java/trunk/src/site/xdoc/releases.xml
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/releases.xml?rev=1229951&r1=1229950&r2=1229951&view=diff
==
--- axis/axis1/java/trunk/src/site/xdoc/releases.xml (original)
+++ axis/axis1/java/trunk/src/site/xdoc/releases.xml Wed Jan 11 10:36:25 2012
@@ -39,22 +39,22 @@
 Final Version 1.4
   
   
-http://www.apache.org/dyn/closer.cgi/ws/axis/1_3/";>1.3
+http://archive.apache.org/dist/ws/axis/1_3/";>1.3
 October 5, 2005
 Final Version 1.3
   
   
-http://www.apache.org/dyn/closer.cgi/ws/axis/1_2_1/";>1.2.1
+http://archive.apache.org/dist/ws/axis/1_2_1/";>1.2.1
 June 15, 2005
 Final Version 1.2.1
   
   
-http://www.apache.org/dyn/closer.cgi/ws/axis/1_2/";>1.2
+http://archive.apache.org/dist/ws/axis/1_2/";>1.2
 May 4, 2005
 Final Version 1.2
   
   
-http://ws.apache.org/axis/download.cgi";>1.1 (from 
mirror)
+http://archive.apache.org/dist/ws/axis/1_1/";>1.1
 June 16, 2003
 Final Version 1.1
   




svn commit: r1229959 - in /axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp: ./ src/ src/main/ src/main/resources/ src/main/resources/META-INF/ src/main/resources/META-INF/maven/ sr

2012-01-11 Thread sagara
Author: sagara
Date: Wed Jan 11 11:20:15 2012
New Revision: 1229959

URL: http://svn.apache.org/viewvc?rev=1229959&view=rev
Log:
Added new module  AXIS2-5230.

Added:
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml 
  (with props)
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/META-INF/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/META-INF/maven/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/META-INF/maven/archetype-metadata.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/META-INF/maven/archetype.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/pom.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/java/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/java/SimpleService.java
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/resources/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/modules/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/modules/modules.list

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/services/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/services/SimpleService/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/services/SimpleService/META-INF/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/services/SimpleService/META-INF/services.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
   (with props)

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/test/

axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/src/main/resources/archetype-resources/src/test/java/

Added: 
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml?rev=1229959&view=auto
==
--- axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml 
(added)
+++ axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml 
Wed Jan 11 11:20:15 2012
@@ -0,0 +1,54 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+   4.0.0
+   
+   org.apache.axis2
+   axis2-parent
+   1.7.0-SNAPSHOT
+   ../../../parent/pom.xml
+   
+   org.apache.axis2.archetype
+   quickstart-webapp
+   1.7.0-SNAPSHOT
+   maven-archetype
+   Axis2 quickstart-web archetype 
+   Maven archetype for creating a  Axis2 web Service as a 
webapp 
+
+   
+   
+   
+   src/main/resources
+   true
+   
+   
+
+   
+   
+   

svn commit: r1229960 - /axis/axis2/java/core/trunk/pom.xml

2012-01-11 Thread sagara
Author: sagara
Date: Wed Jan 11 11:22:25 2012
New Revision: 1229960

URL: http://svn.apache.org/viewvc?rev=1229960&view=rev
Log:
Added new module  AXIS2-5230.

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

Modified: axis/axis2/java/core/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1229960&r1=1229959&r2=1229960&view=diff
==
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Wed Jan 11 11:22:25 2012
@@ -70,6 +70,7 @@
 modules/tool/axis2-wsdl2code-maven-plugin
 modules/tool/simple-server-maven-plugin
 modules/tool/archetype/quickstart
+modules/tool/archetype/quickstart-webapp
 modules/webapp
 modules/xmlbeans
 modules/scripting




svn commit: r1230130 - in /axis/axis1/java/trunk: docs/developers-guide.html src/site/xdoc/developers-guide.xml

2012-01-11 Thread veithen
Author: veithen
Date: Wed Jan 11 16:28:10 2012
New Revision: 1230130

URL: http://svn.apache.org/viewvc?rev=1230130&view=rev
Log:
Migrated the developer guide to XDoc.

Added:
axis/axis1/java/trunk/src/site/xdoc/developers-guide.xml
  - copied, changed from r1230001, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/developers-guide.xml
Removed:
axis/axis1/java/trunk/docs/developers-guide.html

Copied: axis/axis1/java/trunk/src/site/xdoc/developers-guide.xml (from 
r1230001, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/developers-guide.xml)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/developers-guide.xml?p2=axis/axis1/java/trunk/src/site/xdoc/developers-guide.xml&p1=webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/developers-guide.xml&r1=1230001&r2=1230130&rev=1230130&view=diff
==
--- 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/developers-guide.xml
 (original)
+++ axis/axis1/java/trunk/src/site/xdoc/developers-guide.xml Wed Jan 11 
16:28:10 2012
@@ -1,85 +1,56 @@
 
-
-
-  
-WebServices - Axis
-  
+
+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";>
+  
+Developer's Guide
+  
   
 
-
-
-Axis Developer's Guide
-
-1.2 Version
-  Feedback: mailto:axis-...@ws.apache.org";>axis-...@ws.apache.org
-
-
-
-Table of Contents
-
-
-  Introduction
-  General Guidelines
-  Development Environment
-  Pluggable-Components
-  
-Discovery
-Logging/Tracing
-Axis Servlet Query String 
Plug-ins
-  
-  Configuration Properties
-  Exception Handling
-  Compile and Run
-  Internationalization
-  
-Developer Guidelines
-Interface
-Extending Message Files
-  
-  Adding Testcases
-  Creating a WSDL Test
-  Test Structure
-  Adding Source Code Checks
-  JUnit and Axis
-  Using tcpmon to Monitor 
Functional Tests
-  Using SOAP Monitor 
to Monitor Functional Tests
-  Running a Single Functional 
Test
-  Debugging
-  
-Turning on Debug Output
-Writing Temporary Output
-  
-  Running the JAX-RPC 
Compatibility Tests
-
+
+
+
 
 
 
-
-
-Introduction
+
 
 This guide is a collection of topics related to developing code for 
Axis.
 
 
 
-
-
-General Guidelines
+
 
 
-  Axis specific information (cvs repository access, mailing list info, 
etc.) can be found on the http://ws.apache.org/axis/index.html";>Axis 
Home Page.
+  Axis specific information (svn repository access, mailing list info, 
etc.) can be found on the http://ws.apache.org/axis/index.html";>Axis 
Home Page.
   Axis uses the http://jakarta.apache.org/site/guidelines.html";>Jakarta Project 
Guidelines.
   Code changes should comply with http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html";>"Code 
Conventions for the Java Programming Language"
-  When fixing a bug, please include the href of the bug in the cvs commit 
message.
+  When fixing a bug, please include the href of the bug in the svn commit 
message.
   Incompatible changes to published Axis interfaces 
should be avoided where possible. When changes are necessary, for example to 
maintain or improve the overall modularity of Axis, the impact on users must be 
considered and, preferably, documented.
   If you are making a big change that may affect interoperability, please 
run the http://xml.apache.org/~rubys/echotest.pl";>echotest2 round 2 
interop test to ensure that your change does not result in any new interop 
failures. You will also need the http://xml.apache.org/~rubys/client_deploy.wsdd";>client_deploy.wsdd. 
Here are the http://xml.apache.org/~rubys/ApacheClientInterop.html";>nightly interop 
test results.
 
 
 
 
-
-
-Development Environment
+
 
 The following packages are required for axis development:
 
@@ -110,15 +81,11 @@ G:\xml-axis\java\build\classes
 
 
 
-
-
-Pluggable-Components
+
 
 The Axis Architecture Guide explains 
the requirements for pluggable components.
 
-
-
-Discovery
+
 
 An Axis-specific component factory should be created of the form:
 
@@ -128,17 +95,14 @@ G:\xml-axis\java\build\classes
 
 The org.apache.axis.components.image package demonstrates both 
a factory, and supporting classes for different image tools used by Axis. This 
is representative of a pluggable component that uses external tooling, 
isolating it behind a 'thin' wrapper to Axis that provides only a limited 
interface to meet Axis minimal requirements. This allows future designers and 
implementors to gain an explicit understanding of the Axis's
   specific requirements on these tools.
-  
-
 
-
-
-Logging/Tracing
+
+
+
 
 Axis logging and tracing is based on the Logging component of the http://jakarta.apache.org/commons/index.html";>Jakarta Commons 
project, or the Jakarta Commons Logging (JCL) SPI. The JCL 

svn commit: r1230161 - in /axis/axis1/java/trunk: docs/install.html src/site/xdoc/install.xml

2012-01-11 Thread veithen
Author: veithen
Date: Wed Jan 11 17:28:33 2012
New Revision: 1230161

URL: http://svn.apache.org/viewvc?rev=1230161&view=rev
Log:
Migrated the installation guide to XDoc.

Added:
axis/axis1/java/trunk/src/site/xdoc/install.xml
  - copied, changed from r1230132, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/install.xml
Removed:
axis/axis1/java/trunk/docs/install.html

Copied: axis/axis1/java/trunk/src/site/xdoc/install.xml (from r1230132, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/install.xml)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/install.xml?p2=axis/axis1/java/trunk/src/site/xdoc/install.xml&p1=webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/install.xml&r1=1230132&r2=1230161&rev=1230161&view=diff
==
--- 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/install.xml
 (original)
+++ axis/axis1/java/trunk/src/site/xdoc/install.xml Wed Jan 11 17:28:33 2012
@@ -1,58 +1,37 @@
 
-
-
-  
-WebServices - Axis
-  
+
+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";>
+  
+Installation instructions
+  
   
 
-
-
-Axis installation instructions
-
-
-
-Table of Contents
+
 
-
-
-  Introduction
-  Things you have to know
-  Step 0: Concepts
-  Step 1: Preparing the webapp
-  Step 2: Setting up the 
libraries
-  
-Tomcat 4.x and Java 1.4
-WebLogic 8.1
-  
-  Step 3: starting the web 
server
-  Step 4: Validate the 
Installation
-  
-Look for the start page
-Validate Axis with 
happyaxis
-Look for some services
-Test a SOAP Endpoint
-Test a JWS Endpoint
-  
-  Step 5: Installing new Web 
Services
-  Step 6: Deploying your Web 
Service
-  
-Classpath setup
-Find the deployment 
descripto
-Run the admin client
-  
-  Step 7: Testing
-  Advanced 
Installation: adding Axis to your own Webapp
-  What if it doesn't work?
-  Summary
-  Appendix: Enabling the SOAP 
Monitor
-
+
 
 
 
-
-
-Introduction
+
 
 This document describes how to install Apache Axis. It assumes you already 
know how to write and run Java code and are not afraid of XML. You should also 
have an application server or servlet engine and be familiar with operating and 
deploying to it. If you need an application server, we recommend http://jakarta.apache.org/tomcat/";>Jakarta Tomcat. [If you are 
installing Tomcat, get the latest 4.1.x version, and the full distribution, not 
the LE version for Java 1.4, as that omits the Xerces XML parser]. Other 
servlet engines are supported, provided they implement version 2.2 or greater 
of the servlet API. Note also that Axis client and server requires Java 1.3 or 
later.
 
@@ -60,9 +39,7 @@
 
 
 
-
-
-Things you have to know
+
 
 A lot of problems with Axis are encountered by people who are new to Java, 
server-side Java and SOAP. While you can learn about SOAP as you go along, 
writing Axis clients and servers is not the right time to be learning 
foundational Java concepts, such as what an array is, or basic application 
server concepts such as how servlets work, and the basics of the HTTP 
protocol.
 
@@ -88,9 +65,7 @@
 
 
 
-
-
-Step 0: Concepts
+
 
 Apache Axis is an Open Source SOAP server and client. SOAP is a mechanism 
for inter-application communication between systems written in arbitrary 
languages, across the Internet. SOAP usually exchanges messages over HTTP: the 
client POSTs a SOAP request, and receives either an HTTP success code and a 
SOAP response or an HTTP error code. Open Source means that you get the source, 
but that there is no formal support organisation to help you when things go 
wrong.
 
@@ -108,9 +83,7 @@ version of Java everywhere.
 
 
 
-
-
-Step 1: Preparing the webapp
+
 
 Here we assume that you have a web server up and running on the localhost 
at port 8080. If your server is on a different port, replace references to 8080 
to your own port number.
 
@@ -118,31 +91,25 @@ version of Java everywhere.
 
 
 
-
-
-Step 2: Setting up the libraries
+
 
 In the Axis directory, you will find a WEB-INF sub-directory. This 
directory contains some basic configuration information, but can also be used 
to contain the dependencies and web services you wish to deploy.
 
 Axis needs to be able to find an XML parser. If your application server or 
Java runtime does not make one visible to web applications, you need to 
download and add it. Java 1.4 includes the Crimson parser, so you can 
omit this stage, though the Axis team prefer Xerces.
 
-To add an XML parser, acquire the JAXP 1.1 XML compliant parser of your 
choice. We recommend Xerces jars from the http://xml.apache.org/dist/xerces-j/";>xml-xerces distribution, though 
others mostly work. Unless your JRE or app server has it

svn commit: r1230211 - in /axis/axis1/java/trunk: docs/index.html docs/reading.html src/site/xdoc/overview.xml src/site/xdoc/reading.xml

2012-01-11 Thread veithen
Author: veithen
Date: Wed Jan 11 19:52:05 2012
New Revision: 1230211

URL: http://svn.apache.org/viewvc?rev=1230211&view=rev
Log:
Some more site migration work.

Added:
axis/axis1/java/trunk/src/site/xdoc/overview.xml
  - copied, changed from r1230195, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/index.xml
axis/axis1/java/trunk/src/site/xdoc/reading.xml
  - copied, changed from r1230199, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/reading.xml
Removed:
axis/axis1/java/trunk/docs/index.html
axis/axis1/java/trunk/docs/reading.html

Copied: axis/axis1/java/trunk/src/site/xdoc/overview.xml (from r1230195, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/index.xml)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/overview.xml?p2=axis/axis1/java/trunk/src/site/xdoc/overview.xml&p1=webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/index.xml&r1=1230195&r2=1230211&rev=1230211&view=diff
==
--- 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/index.xml
 (original)
+++ axis/axis1/java/trunk/src/site/xdoc/overview.xml Wed Jan 11 19:52:05 2012
@@ -1,20 +1,35 @@
 
-
-
-  
-WebServices - Axis
-  
+
+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";>
+  
+Documentation overview
+  
   
 
-
-
-Documentation
-
-This is the documentation for http://ws.apache.org/axis/";>Apache 
Axis 1.2. If the version of Axis you are using is older or newer than this 
version, then this is the wrong documentation to be using. Read the version 
that came with your copy of Axis.
-
-
-
-Documentation for Axis Users
+
+
+This is the documentation for http://ws.apache.org/axis/";>Apache 
Axis 1.4. If the version of Axis you are using is older or newer than this 
version, then this is the wrong documentation to be using. Read the version 
that came with your copy of Axis.
+
+
 
 
   Installation Instructions
@@ -26,11 +41,9 @@
   Further Reading
 
 
-
+
 
-
-
-Documentation for Axis Developers
+
 
 
   http://ws.apache.org/axis/java/apiDocs/index.html";>API 
Documentation
@@ -40,7 +53,7 @@
   Architecture Guide - Axis design 
concepts and rationale.
 
 
-
+
 
 
 

Copied: axis/axis1/java/trunk/src/site/xdoc/reading.xml (from r1230199, 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/reading.xml)
URL: 
http://svn.apache.org/viewvc/axis/axis1/java/trunk/src/site/xdoc/reading.xml?p2=axis/axis1/java/trunk/src/site/xdoc/reading.xml&p1=webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/reading.xml&r1=1230199&r2=1230211&rev=1230211&view=diff
==
--- 
webservices/axis/trunk/site/src/java/src/documentation/content/xdocs/java/reading.xml
 (original)
+++ axis/axis1/java/trunk/src/site/xdoc/reading.xml Wed Jan 11 19:52:05 2012
@@ -1,36 +1,41 @@
 
-
-
-  
-WebServices - Axis
-  
+
+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";>
+  
+Reading Guide
+  
   
 
-
-
-Recommended Reading
+
 
 Here are things you can read to understand and use Axis better. Remember, 
you also have access to all the source if you really want to find out how 
things work (or why they don't).
 
-
-
-Table of Contents
-
-
-  Axis installation, use and 
internals
-  Specifications
-  Explanations, articles 
and presentations
-  Interoperability
-  Advanced topics
-  Books
-  External Sites covering Web 
Services
-
+
 
-
+
+
+
 
-
-
-Axis installation, use and internals
+
 
 
 
@@ -60,13 +65,25 @@ Kevin Jones talks a bit about configurin
 http://www.fawcette.com/javapro/2003_03/online/wsdl_kjones_03_10_03/";>Different
 WSDL Styles in Axis
 Kevin Jones looks at the document and wrapped styles of WSDL2Java 
bindings.
 
+
+http://www.j2ee-security.net/book/sample-chap/";>Web 
Services Security with Axis
+This sample chapter from http://www.j2ee-security.net/";>J2EE 
Security for Servlets,
+EJBs and Web Services book explains use of username/password based 
authentication,
+SSL and Servlet security mechanisms for securing the transport and
+WS-Security for securing the messages with Apache Axis. To illustrate use 
of handlers for
+enforcing security, it describes the implementation of a bare-bones 
WS-Security mechanism
+using http://www.xmltrustcenter.org/developer/verisign/tsik/index.htm";>
+VeriSign's TSIK and JAX-RPC handlers. You can also
+http://www.j2ee-security.net/book/viewsource.php";>view or
+http://www.j2ee-security.net/book/dnldsrc/";>download the 
complete sour

svn commit: r1230406 [2/2] - in /axis/axis2/java/core/branches/AXIS2-4318: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/clustering/ modules/codegen/ modules/corba/ modules/fastinfo

2012-01-11 Thread sagara
Modified: 
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java?rev=1230406&r1=1230404&r2=1230406&view=diff
==
--- 
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
 (original)
+++ 
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/test/org/apache/axis2/transport/http/HTTPSenderTest.java
 Thu Jan 12 05:54:47 2012
@@ -35,9 +35,11 @@ import org.apache.axis2.transport.http.m
 /**
  * The Class HTTPSenderTest.
  */
-public class HTTPSenderTest extends AbstractHTTPServerTest {
+public abstract class HTTPSenderTest extends AbstractHTTPServerTest {

 private HTTPSender httpSender;
+
+protected abstract HTTPSender getHTTPSender();
 
 /**
  * Send via http.
@@ -51,7 +53,7 @@ public class HTTPSenderTest extends Abst
  */
 private void sendViaHTTP(String httpMethod, String soapAction, String 
address, boolean rest)
 throws IOException, MessagingException {
-httpSender = new HTTPSender();
+httpSender = getHTTPSender();
 MessageContext msgContext = new MessageContext();
 ConfigurationContext configContext = ConfigurationContextFactory
 .createEmptyConfigurationContext();
@@ -66,7 +68,7 @@ public class HTTPSenderTest extends Abst
 httpSender.send(msgContext, url, soapAction);

 
-}
+}   
 
 /**
  * Test send via get.




svn commit: r1230408 - /axis/axis2/java/core/branches/AXIS2-4318/

2012-01-11 Thread sagara
Author: sagara
Date: Thu Jan 12 06:02:49 2012
New Revision: 1230408

URL: http://svn.apache.org/viewvc?rev=1230408&view=rev
Log:
Delete the branch created using Maven it seems merging is easy with manually 
created  branch.  

Removed:
axis/axis2/java/core/branches/AXIS2-4318/



svn commit: r1230410 - /axis/axis2/java/core/branches/AXIS2-4318/

2012-01-11 Thread sagara
Author: sagara
Date: Thu Jan 12 06:10:17 2012
New Revision: 1230410

URL: http://svn.apache.org/viewvc?rev=1230410&view=rev
Log:
Creating a branch for AXIS2-4318.

Added:
axis/axis2/java/core/branches/AXIS2-4318/
  - copied from r1230409, axis/axis2/java/core/trunk/



svn commit: r1230421 - in /axis/axis2/java/core/trunk/modules: osgi/pom.xml tool/archetype/quickstart-webapp/pom.xml tool/archetype/quickstart/pom.xml tool/simple-server-maven-plugin/pom.xml transport

2012-01-11 Thread sagara
Author: sagara
Date: Thu Jan 12 07:23:51 2012
New Revision: 1230421

URL: http://svn.apache.org/viewvc?rev=1230421&view=rev
Log:
Reverted incorrect modification on POM files.

Modified:
axis/axis2/java/core/trunk/modules/osgi/pom.xml
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/pom.xml

Modified: axis/axis2/java/core/trunk/modules/osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi/pom.xml?rev=1230421&r1=1230420&r2=1230421&view=diff
==
--- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Thu Jan 12 07:23:51 2012
@@ -117,7 +117,6 @@
 org.apache.axiom.*,
 org.apache.commons.fileupload.*,
 org.apache.commons.httpclient.*,
-org.apache.http.auth.*;resolution:=optional,
 org.apache.commons.lang;resolution:=optional,
 org.apache.commons.logging,
 org.apache.http;resolution:=optional,

Modified: 
axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml?rev=1230421&r1=1230420&r2=1230421&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml 
(original)
+++ axis/axis2/java/core/trunk/modules/tool/archetype/quickstart-webapp/pom.xml 
Thu Jan 12 07:23:51 2012
@@ -19,7 +19,8 @@
   ~ under the License.
   -->
 
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0

org.apache.axis2

Modified: axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml?rev=1230421&r1=1230420&r2=1230421&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml 
(original)
+++ axis/axis2/java/core/trunk/modules/tool/archetype/quickstart/pom.xml Thu 
Jan 12 07:23:51 2012
@@ -19,7 +19,8 @@
   ~ under the License.
   -->
 
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0

org.apache.axis2

Modified: 
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml?rev=1230421&r1=1230420&r2=1230421&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml 
(original)
+++ axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml 
Thu Jan 12 07:23:51 2012
@@ -19,7 +19,8 @@
   ~ under the License.
   -->
 
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 4.0.0
 
 org.apache.axis2

Modified: axis/axis2/java/core/trunk/modules/transport/http/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=1230421&r1=1230420&r2=1230421&view=diff
==
--- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Thu Jan 12 
07:23:51 2012
@@ -109,16 +109,5 @@
 commons-httpclient
 commons-httpclient
 
-   
-   org.apa

svn commit: r1230425 - in /axis/axis2/java/core/branches/AXIS2-4318: ./ modules/osgi/ modules/tool/archetype/quickstart-webapp/ modules/tool/archetype/quickstart/ modules/tool/simple-server-maven-plug

2012-01-11 Thread sagara
Author: sagara
Date: Thu Jan 12 07:31:12 2012
New Revision: 1230425

URL: http://svn.apache.org/viewvc?rev=1230425&view=rev
Log:
Merged r1230421 to the AXIS2-4318 branch.

Modified:
axis/axis2/java/core/branches/AXIS2-4318/   (props changed)
axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml

axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml

axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml

axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml
axis/axis2/java/core/branches/AXIS2-4318/modules/transport/http/pom.xml

Propchange: axis/axis2/java/core/branches/AXIS2-4318/
--
svn:mergeinfo = /axis/axis2/java/core/trunk:1230421

Modified: axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==
--- axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/branches/AXIS2-4318/modules/osgi/pom.xml Thu Jan 12 
07:31:12 2012
@@ -117,7 +117,6 @@
 org.apache.axiom.*,
 org.apache.commons.fileupload.*,
 org.apache.commons.httpclient.*,
-org.apache.http.auth.*;resolution:=optional,
 org.apache.commons.lang;resolution:=optional,
 org.apache.commons.logging,
 org.apache.http;resolution:=optional,

Modified: 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==
--- 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml
 (original)
+++ 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart-webapp/pom.xml
 Thu Jan 12 07:31:12 2012
@@ -19,7 +19,8 @@
   ~ under the License.
   -->
 
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0

org.apache.axis2

Modified: 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==
--- 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml
 (original)
+++ 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/archetype/quickstart/pom.xml
 Thu Jan 12 07:31:12 2012
@@ -19,7 +19,8 @@
   ~ under the License.
   -->
 
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0

org.apache.axis2

Modified: 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml?rev=1230425&r1=1230424&r2=1230425&view=diff
==
--- 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml
 (original)
+++ 
axis/axis2/java/core/branches/AXIS2-4318/modules/tool/simple-server-maven-plugin/pom.xml
 Thu Jan 12 07:31:12 2012
@@ -19,7 +19,8 @@
   ~ under the License.
   -->
 
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 4.0.0
 
 org.apache.axis2

Modified: 
axis/a