[RPM (6.0)] [DIST generic] axis2-1.5.6-1.jpp6

Ralph Apel <[email protected]> Sun, 13 Jan 2013 05:45:10 +0100
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : axis2                        Relocations: (not relocatable)
Version     : 1.5.6                             Vendor: JPackage Project
Release     : 1.jpp6                        Build Date: Sun 13 Jan 2013 05:15:56 AM CET
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Libraries/Java    Source RPM: (none)
Size        : 8032806                          License: Apache Software License
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://ws.apache.org/axis2/
Summary     : A SOAP implementation in Java
Description :
Axis2 is an effort to re-design and totally re-implement both
Axis/Java and (eventually) Axis/C++ on a new architecture.
Evolving from the now standard "handler chain" model which
Axis1 pioneered, Axis2 is developing a more flexible pipeline
architecture which can yet be managed and packaged in a more
organized manner. This new design acknowledges the maturing
of the Web services space in terms of new protocols such as
WS-ReliableMessaging, WS-Security and WS-Addressing that are
built on top of the base SOAP system. At the time Axis1 was
designed, while it was fully expected that other protocols
such as WS-ReliableMessaging would be built on top of it,
there was not a proper extension architecture defined to
enable clean composition of such layers. Thus, one of the
key motivations for Axis2 is to provide a clean and simple
environment for like Apache Sandesha and Apache WSS4J to
layer on top of the base SOAP system. Another driving force
for Axis2 as well as the move away from RPC oriented Web
services towards more document-oriented, message style
asynchronous service interactions. The Axis2 project is
centered on a new representation for SOAP messages called
AXIOM (AXIs Object Model). AXIOM consists of two parts: a
complete XML Infoset representation and a SOAP Infoset
representation on top of that. The XML Infoset representa-
tion provides a JDOM-like simple API but is built on a
deferred model via a StAX-based (Streaming API for XML)
pull parsing API. A key feature of AXIOM is that it allows
one to stop building the XML tree and just access the pull
stream directly; thus enabling both maximum flexibility
and maximum performance. This approach allows us to
support multiple levels of abstraction for consuming and
offering Web services: using plain AXIOM, using generated
code and statically data-bound data types and so on. At
the time of Axis1's design, RPC-style, synchronous,
request-response interactions were the order of the day
for Web services. Today service interactions are much more
message-oriented and exploit many different message exchange
patterns. The Axis2 engine architecture is careful to not
build in any assumptions of request-response patterns to
ensure that it can be used easily to support arbitrary
message exchange patterns.

---------------
Ralph Apel <r.apel at r-apel.de> - 0:1.5.6-1
- 1.5.6
---------------
axis2.src:257: W: unversioned-explicit-obsoletes axis2-saaj-1.1-api
axis2.src:258: W: unversioned-explicit-obsoletes axis2-jaxws-2.0-api
axis2.src:259: W: unversioned-explicit-obsoletes axis2-jws-api
axis2.src: W: source-or-patch-not-bzipped axis2-pom.patch
axis2.src: W: source-or-patch-not-bzipped axis2-modules-webapp-pom.patch
axis2.src: W: source-or-patch-not-bzipped axis2-modules-parent-pom.patch
axis2.src: W: source-or-patch-not-bzipped axis2-modules-kernel-pom.patch
axis2.src: W: source-or-patch-not-bzipped axis2-site.patch
axis2.src: W: no-signature
1 packages and 0 specfiles checked; 0 errors, 9 warnings.

---------------
Index: axis2-maven2-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/axis2/axis2-maven2-jpp-depmap.xml,v
retrieving revision 1.3
diff -u -r1.3 axis2-maven2-jpp-depmap.xml
--- axis2-maven2-jpp-depmap.xml	29 Jun 2011 09:33:39 -0000	1.3
+++ axis2-maven2-jpp-depmap.xml	13 Jan 2013 04:45:07 -0000
@@ -1,5 +1,513 @@
 <dependencies>
+
+<!--
+<dependency>
+    <maven>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jspc-maven-plugin</artifactId>
+        <version>1.4.6</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>mojo-jspc-maven-plugin</artifactId>
+        <version>1.4.6</version>
+    </jpp>
+</dependency>
+-->
+
+
+<dependency>
+    <maven>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>jasper-jdt</artifactId>
+        <version>6.0.18</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>ecj3</artifactId>
+        <version>3.7</version>
+    </jpp>
+</dependency>
+<dependency>
+    <maven>
+        <groupId>org.eclipse.jdt.core.compiler</groupId>
+        <artifactId>ecj</artifactId>
+        <version>3.3.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>ecj3</artifactId>
+        <version>3.7</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>com.sun.xml.parsers</groupId>
+        <artifactId>jaxp-ri</artifactId>
+        <version>1.4.2</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>empty-dep</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.7</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>mojo-build-helper-maven-plugin</artifactId>
+        <version>1.7</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>5.1.10</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/jetty5</groupId>
+        <artifactId>jetty5</artifactId>
+        <version>5.1.15</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.shared</groupId>
+        <artifactId>maven-common-artifact-filters</artifactId>
+        <version>1.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>maven-common-artifact-filters</artifactId>
+        <version>1.4</version>
+    </jpp>
+</dependency>
+
 <!--
+  <dependency>
+	<maven>
+	  <groupId>aopalliance</groupId>
+	  <artifactId>aopalliance</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>aopalliance</artifactId>
+	  <version>1.0</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>xalan</groupId>
+	  <artifactId>xalan</artifactId>
+	  <version>${xalan.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>xalan-j2</artifactId>
+	  <version>2.7.0</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>wsdl4j</groupId>
+	  <artifactId>wsdl4j</artifactId>
+	  <version>${wsdl4j.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>wsdl4j</artifactId>
+	  <version>1.6.2</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>stax</groupId>
+	  <artifactId>stax-api</artifactId>
+	  <version>${stax.api.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>bea-stax-api</artifactId>
+	  <version>1.2.0</version>
+	</jpp>
+  </dependency>
+
+
+  <dependency>
+	<maven>
+	  <groupId>org.apache.ant</groupId>
+	  <artifactId>ant</artifactId>
+	  <version>${ant.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>ant</artifactId>
+	  <version>1.6.5</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>org.apache.ws.commons.axiom</groupId>
+	  <artifactId>axiom-api</artifactId>
+	  <version>${axiom.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>ws-commons-axiom-api</artifactId>
+	  <version>1.2.4</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>org.apache.ws.commons.axiom</groupId>
+	  <artifactId>axiom-impl</artifactId>
+	  <version>${axiom.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>ws-commons-axiom-impl</artifactId>
+	  <version>1.2.4</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>annogen</groupId>
+	  <artifactId>annogen</artifactId>
+	  <version>${annogen.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>annogen</artifactId>
+	  <version>0.1.1</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>backport-util-concurrent</groupId>
+	  <artifactId>backport-util-concurrent</artifactId>
+	  <version>${backport.util.concurrent.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>backport-util-concurrent</artifactId>
+	  <version>3.1</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>commons-fileupload</groupId>
+	  <artifactId>commons-fileupload</artifactId>
+	  <version>${commons.fileupload.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>commons-fileupload</artifactId>
+	  <version>1.1.1</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>httpcomponents-httpcore</groupId>
+	  <artifactId>jakarta-httpcore</artifactId>
+	  <version>2.0.7</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>jakarta-httpcore</artifactId>
+	  <version>4.0</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.apache.httpcomponents</groupId>
+	  <artifactId>jakarta-httpcore</artifactId>
+	  <version>${jakarta.httpcore.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>jakarta-httpcore</artifactId>
+	  <version>4.0</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>xmlunit</groupId>
+	  <artifactId>xmlunit</artifactId>
+	  <version>${xmlunit.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>xmlunit</artifactId>
+	  <version>1.0</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.custommonkey.xmlunit</groupId>
+	  <artifactId>xmlunit</artifactId>
+	  <version>1.0</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>xmlunit</artifactId>
+	  <version>1.0</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>xmlbeans</groupId>
+	  <artifactId>xbean</artifactId>
+	  <version>${xbean.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/xmlbeans</groupId>
+	  <artifactId>xbean</artifactId>
+	  <version>2.1.0</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>bcel</groupId>
+	  <artifactId>bcel</artifactId>
+	  <version>${bcel.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>bcel</artifactId>
+	  <version>5.2</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>org.apache.bcel</groupId>
+	  <artifactId>bcel</artifactId>
+	  <version>${bcel.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>bcel</artifactId>
+	  <version>5.2</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>org.apache.ant</groupId>
+	  <artifactId>ant-launcher</artifactId>
+	  <version>${ant.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>ant-launcher</artifactId>
+	  <version>1.6.5</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-beans</artifactId>
+	  <version>${spring.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/spring</groupId>
+	  <artifactId>beans</artifactId>
+	  <version>1.2.9</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-context</artifactId>
+	  <version>${spring.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/spring</groupId>
+	  <artifactId>context</artifactId>
+	  <version>1.2.9</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-core</artifactId>
+	  <version>${spring.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/spring</groupId>
+	  <artifactId>core</artifactId>
+	  <version>1.2.9</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-web</artifactId>
+	  <version>${spring.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP/spring</groupId>
+	  <artifactId>web</artifactId>
+	  <version>1.2.9</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>servletapi</groupId>
+	  <artifactId>servletapi</artifactId>
+	  <version>${servlet.api.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>JPP</groupId>
+	  <artifactId>servletapi4</artifactId>
+	  <version>2.3</version>
+	</jpp>
+  </dependency>
+
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.ui</groupId>
+	  <artifactId>org.eclipse.ui.workbench</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.ui.workbench</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.ui</groupId>
+	  <artifactId>org.eclipse.ui.ide</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.ui.ide</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.equinox</groupId>
+	  <artifactId>org.eclipse.equinox.common</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.equinox.common</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.swt</groupId>
+	  <artifactId>org.eclipse.swt</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.swt</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.swt</groupId>
+	  <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.swt.arch</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.osgi</groupId>
+	  <artifactId>org.eclipse.osgi</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.osgi</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.core</groupId>
+	  <artifactId>org.eclipse.core.jobs</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.core.jobs</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.core</groupId>
+	  <artifactId>org.eclipse.core.resources</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.core.resources</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.core</groupId>
+	  <artifactId>org.eclipse.core.runtime</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.core.runtime</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
+  <dependency>
+	<maven>
+	  <groupId>org.eclipse.jface</groupId>
+	  <artifactId>org.eclipse.jface</artifactId>
+	  <version>${eclipse.version}</version>
+	</maven>
+	<jpp>
+	  <groupId>ECLIPSE</groupId>
+	  <artifactId>org.eclipse.jface</artifactId>
+	  <version>3.2.2</version>
+	</jpp>
+  </dependency>
 -->
 
   <dependency>
@@ -87,8 +595,8 @@
 	</maven>
 	<jpp>
 	  <groupId>JPP</groupId>
-	  <artifactId>junit4</artifactId>
-	  <version>4.5</version>
+	  <artifactId>junit44</artifactId>
+	  <version>4.4</version>
 	</jpp>
   </dependency>
 
@@ -159,6 +667,19 @@
 
 <dependency>
     <maven>
+        <groupId>com.thoughtworks.qdox</groupId>
+        <artifactId>qdox</artifactId>
+        <version>1.12</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>qdox</artifactId>
+        <version>1.12</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
         <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
         <version>1.5</version>
@@ -170,4 +691,290 @@
     </jpp>
 </dependency>
 
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact-manager</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact-manager</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact-test</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact-test</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-core</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>core</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-error-diagnostics</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>error-diagnostics</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>model</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-monitor</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>monitor</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-api</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-api</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-descriptor</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-descriptor</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-parameter-documenter</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-parameter-documenter</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-registry</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-registry</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-profile</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>profile</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-project</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>project</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-repository-metadata</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>repository-metadata</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-settings</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>settings</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.reporting</groupId>
+        <artifactId>maven-reporting-api</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>reporting-api</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script-ant</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script-ant</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script-beanshell</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script-beanshell</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.reporting</groupId>
+        <artifactId>maven-reporting</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>reporting</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>10</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>10</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>maven</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
 </dependencies>
Index: axis2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/axis2/axis2.spec,v
retrieving revision 1.4
diff -u -r1.4 axis2.spec
--- axis2.spec	26 Nov 2011 12:34:31 -0000	1.4
+++ axis2.spec	13 Jan 2013 04:45:07 -0000
@@ -42,8 +42,6 @@
 %define codegenplugindir %{eclipseplugdir}/Axis2_Codegen_Wizard_1.2.0
 %define sarchiverplugindir %{eclipseplugdir}/Axis_Service_Archiver_1.0.0
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
@@ -53,39 +51,26 @@
 %define section    free
 
 Name:          axis2
-Version:       1.4.1
-Release:       3%{?dist}
+Version:       1.5.6
+Release:       1%{?dist}
 Epoch:         0
 Summary:       A SOAP implementation in Java
 License:       Apache Software License
 Group:         Development/Libraries/Java
 Url:           http://ws.apache.org/%{name}/
 
-#svn export http://svn.apache.org/repos/asf/webservices/axis2/tags/java/v1.4.1/ axis2
+# svn export http://svn.apache.org/repos/asf/axis/axis2/java/core/tags/v1.5.6/ axis2
 Source0:       %{name}-%{version}.tar.gz
 
 Source1:        %{name}-settings.xml
 Source2:        %{name}-maven2-jpp-depmap.xml
 
-Patch0:         axis2-noidea-pom_xml.patch
-Patch1:         axis2-noeclipse-pom_xml.patch
-Patch2:         axis2-modules-parent-pom_xml.patch
-Patch3:         axis2-modules-kernel-pom_xml.patch
-Patch4:         axis2-modules-jibx-pom_xml.patch
-Patch5:         axis2-modules-json-pom_xml.patch
-Patch6:         axis2-modules-eclipse-codegen-pom_xml.patch
-Patch7:         axis2-modules-eclipse-service-pom_xml.patch
-Patch8:         axis2-modules-adb-codegen-pom_xml.patch
-Patch9:         axis2-modules-tool-ant-plugin-pom_xml.patch
-Patch10:        axis2-modules-saaj-pom_xml.patch
-Patch11:        axis2-modules-jaxws-pom_xml.patch
-Patch12:        axis2-modules-kernel-XMPPConnectionFactory.patch
-Patch13:        axis2-modules-jaxws-integration-pom_xml.patch
-Patch14:        axis2-modules-jaxbri-pom_xml.patch
-Patch15:        axis2-modules-tool-idea-plugin-pom_xml.patch
-Patch16:        axis2-modules-documentation-pom_xml.patch
-Patch17:        axis2-modules-addressing-pom.patch
-Patch18:        axis2-documentation-site.patch
+Patch0:         axis2-modules-parent-pom.patch
+Patch1:         axis2-modules-kernel-pom.patch 
+Patch2:         axis2-pom.patch
+Patch3:         axis2-modules-webapp-pom.patch
+Patch4:         axis2-site.patch
+
 
 BuildRequires:  jpackage-utils >= 0:1.7.5
 BuildRequires:  java-devel >= 0:1.6.0
@@ -97,6 +82,7 @@
 BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-clean
 BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-dependency
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
@@ -105,14 +91,18 @@
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-site
 BuildRequires:  maven2-plugin-war
-BuildRequires:  maven2-default-skin
+BuildRequires:  maven-skins
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  maven-shared-plugin-testing-harness
-BuildRequires:  mojo-maven2-plugin-build-helper
+BuildRequires:  jetty6-maven2-plugins
+BuildRequires:  mojo-build-helper-maven-plugin
+BuildRequires:  mojo-maven2-plugin-jspc
+BuildRequires:  mojo-maven2-jspc-compiler-tomcat6
 BuildRequires:  apache-commons-parent
 BuildRequires:  geronimo-genesis
 BuildRequires:  geronimo-genesis2
+BuildRequires:  oss-parent
 %endif
 BuildRequires:  activemq4
 BuildRequires:  annogen >= 0:0.1.1
@@ -120,7 +110,9 @@
 BuildRequires:  bcel >= 0:5.1
 BuildRequires:  geronimo-annotation-1.0-api
 BuildRequires:  geronimo-j2ee-management-1.0-api
-BuildRequires:  geronimo-jaf-1.1-api
+BuildRequires:  geronimo-jaxws-2.1-api
+BuildRequires:  geronimo-saaj-1.3-api
+BuildRequires:  geronimo-ws-metadata-2.0-api
 BuildRequires:  apache-commons-codec >= 0:1.3
 BuildRequires:  apache-commons-fileupload >= 0:1.1.1
 BuildRequires:  apache-commons-httpclient >= 0:3.0
@@ -132,9 +124,10 @@
 BuildRequires:  jaxb_2_1_api
 BuildRequires:  jaxen >= 0:1.1
 BuildRequires:  jettison >= 0:1.0
-BuildRequires:  jibx >= 0:1.1.6a
+BuildRequires:  jetty5
+BuildRequires:  jibx >= 0:1.2.1
 BuildRequires:  jms_1_1_api
-BuildRequires:  junit >= 0:3.8.2
+BuildRequires:  junit44
 BuildRequires:  log4j >= 0:1.2.14
 BuildRequires:  qdox
 BuildRequires:  rhino
@@ -148,6 +141,7 @@
 BuildRequires:  stax_1_0_api
 BuildRequires:  sun-fi >= 0:1.2.1
 BuildRequires:  sun-jaxb-2.1-impl
+BuildRequires:  sun-saaj-1.3-impl
 BuildRequires:  glassfish-javamail >= 0:1.4
 BuildRequires:  tomcat6
 BuildRequires:  ws-commons-axiom >= 0:1.2.4
@@ -156,7 +150,7 @@
 BuildRequires:  ws-woden >= 0:1.0-0.m8
 BuildRequires:  ws-jaxme
 BuildRequires:  wsdl4j >= 0:1.6.2
-BuildRequires:  wstx
+BuildRequires:  wstx32
 BuildRequires:  xalan-j2 >= 2.7.0
 BuildRequires:  xml-commons-resolver12
 BuildRequires:  xmlbeans >= 0:2.1.0
@@ -191,7 +185,7 @@
 Requires:       annogen >= 0:0.1.1
 Requires:       ws-commons-axiom >= 0:1.2.4
 Requires:       backport-util-concurrent >= 0:2.1
-Requires:       wstx
+Requires:       wstx32
 Requires:       stax_1_0_api
 Requires:       jaf_1_1_api
 Requires:       jms_1_1_api
@@ -212,17 +206,7 @@
 Provides:       %{name}-tools = %{epoch}:%{version}-%{release}
 Obsoletes:      %{name}-tools < %{epoch}:%{version}-%{release}
 
-
-%if %{gcj_support}
-BuildRequires:    gnu-crypto
-BuildRequires:          java-gcj-compat-devel
-Requires(post):         java-gcj-compat
-Requires(postun):       java-gcj-compat
-%endif
-
-%if ! %{gcj_support}
 BuildArch:      noarch
-%endif
 BuildRoot:     %{_tmppath}/%{name}-%{version}-buildroot
 
 %description
@@ -270,6 +254,9 @@
 %package poms
 Summary:        Poms and depmap frags for %{name}
 Group:          Development/Libraries/Java
+Obsoletes:      axis2-saaj-1.1-api 
+Obsoletes:      axis2-jaxws-2.0-api 
+Obsoletes:      axis2-jws-api
 
 %description poms
 %{summary}.
@@ -297,6 +284,15 @@
 %description adb
 %{summary}.
 
+%package addressing
+Summary:        Addressing module from %{name}
+Group:          Development/Libraries/Java
+Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
+Requires:       %{name}-kernel = %{epoch}:%{version}-%{release}
+
+%description addressing
+%{summary}.
+
 %package clustering
 Summary:        Clustering module from %{name}
 Group:          Development/Libraries/Java
@@ -353,7 +349,7 @@
 Requires:       ws-commons-axiom
 Requires:       ws-commons-XmlSchema
 Requires:       wsdl4j
-Requires:       wstx
+Requires:       wstx32
 
 %description fastinfoset
 %{summary}.
@@ -383,7 +379,7 @@
 Requires:       apache-commons-logging
 Requires:       hc-httpcore >= 0:4.0-1
 Requires:       jaxen
-Requires:       junit
+Requires:       junit44
 Requires:       log4j
 Requires:       spring-beans
 Requires:       spring-context
@@ -396,7 +392,7 @@
 Requires:       ws-commons-XmlSchema
 Requires:       ws-woden >= 0:1.0-0.m8
 Requires:       wsdl4j
-Requires:       wstx
+Requires:       wstx32
 Requires:       xalan-j2
 Requires:       xmlbeans
 Requires:       xmlunit
@@ -416,7 +412,7 @@
 Requires:       stax_1_0_api
 Requires:       glassfish-javamail >= 0:1.4
 Requires:       ws-commons-XmlSchema
-Requires:       wstx
+Requires:       wstx32
 
 %description java2wsdl
 %{summary}.
@@ -432,28 +428,15 @@
 %description jaxbri
 %{summary}.
 
-%package jaxws-2.0-api
-Summary:        JAX-WS 2.0 API from %{name}
-Group:          Development/Libraries/Java
-Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
-Requires:       %{name}-saaj-1.1-api = %{epoch}:%{version}-%{release}
-Requires:       apache-commons-logging
-Requires:       jaxb_2_1_api
-Provides:       jaxws_2_0_api
-Provides:       jaxws_api = 0:2.0
-
-%description jaxws-2.0-api
-%{summary}.
-
 %package jaxws
 Summary:        JAX-WS 2.0 module from %{name}
 Group:          Development/Libraries/Java
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
 Requires:       %{name}-adb = %{epoch}:%{version}-%{release}
-Requires:       %{name}-jaxws-2.0-api = %{epoch}:%{version}-%{release}
+Requires:       jaxws_2_0_api 
 Requires:       %{name}-kernel = %{epoch}:%{version}-%{release}
 Requires:       %{name}-metadata = %{epoch}:%{version}-%{release}
-Requires:       %{name}-saaj-1.1-api = %{epoch}:%{version}-%{release}
+Requires:       saaj_1_1_api 
 Requires:       %{name}-saaj = %{epoch}:%{version}-%{release}
 Requires:       apache-commons-codec
 Requires:       jaxb_2_1_api
@@ -472,7 +455,7 @@
 Requires:       ant
 Requires:       bcel
 Requires:       apache-commons-codec
-Requires:       jibx >= 0:1.1.6a
+Requires:       jibx >= 0:1.2.1
 Requires:       xalan-j2
 
 %description jibx
@@ -488,18 +471,6 @@
 %description json
 %{summary}.
 
-%package jws-api
-Summary:        Webservices Metadata v2.0 API
-Group:          Development/Libraries/Java
-Provides:    ws_metadata_2_0_api = %{version}-%{release}
-Provides:    ws_metadata_api = 0:2.0
-Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
-Requires(preun):  %{_sbindir}/update-alternatives
-Requires(post):  %{_sbindir}/update-alternatives
-
-%description jws-api
-%{summary}.
-
 %package kernel
 Summary:        Kernel module from %{name}
 Group:          Development/Libraries/Java
@@ -521,7 +492,7 @@
 Requires:       ws-commons-XmlSchema
 Requires:       ws-woden >= 0:1.0-0.m8
 Requires:       wsdl4j
-Requires:       wstx
+Requires:       wstx32
 
 %description kernel
 %{summary}.
@@ -530,7 +501,7 @@
 Summary:        Metadata module from %{name}
 Group:          Development/Libraries/Java
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
-Requires:       %{name}-jaxws-2.0-api = %{epoch}:%{version}-%{release}
+Requires:       jaxws_2_0_api
 Requires:       %{name}-kernel = %{epoch}:%{version}-%{release}
 Requires:       %{name}-saaj = %{epoch}:%{version}-%{release}
 Requires:       jaxb_2_1_api
@@ -559,15 +530,26 @@
 %description mtompolicy
 %{summary}.
 
-%package saaj-1.1-api
-Summary:        SAAJ 1.1 API from %{name}
+%package osgi
+Summary:        OSGi module from %{name}
+Group:          Development/Libraries/Java
+Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
+Requires:       %{name}-adb = %{epoch}:%{version}-%{release}
+Requires:       %{name}-kernel = %{epoch}:%{version}-%{release}
+Requires:       %{name}-transport = %{epoch}:%{version}-%{release}
+Requires:       org.osgi.compendium
+Requires:       org.osgi.core
+Requires:       servlet_2_4_api
+
+%description osgi
+%{summary}.
+
+%package resource-bundle
+Summary:        Resource bundle from %{name}
 Group:          Development/Libraries/Java
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
-Requires:       javamail_1_4_api
-Provides:       saaj_1_1_api
-Provides:       saaj_api = 0:1.1
 
-%description saaj-1.1-api
+%description resource-bundle
 %{summary}.
 
 %package saaj
@@ -575,39 +557,20 @@
 Group:          Development/Libraries/Java
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
 Requires:       %{name}-kernel = %{epoch}:%{version}-%{release}
-Requires:       %{name}-saaj-1.1-api = %{epoch}:%{version}-%{release}
+Requires:       saaj_1_1_api 
 Requires:       xalan-j2
 
 %description saaj
 %{summary}.
 
-%if %{with_maven}
 %package samples
-Summary:        Samples module from %{name}
+Summary:        Samples for %{name}
 Group:          Development/Libraries/Java
 Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
-Requires:       %{name}-adb = %{epoch}:%{version}-%{release}
 Requires:       %{name}-kernel = %{epoch}:%{version}-%{release}
-Requires:       %{name}-modules = %{epoch}:%{version}-%{release}
-Requires:       annogen
-Requires:       backport-util-concurrent
-Requires:       groovy15
-Requires:       jaf_1_1_api
-Requires:       apache-commons-codec
-Requires:       apache-commons-httpclient
-Requires:       apache-commons-logging
-Requires:       jaxen
-Requires:       stax_1_0_api
-Requires:       glassfish-javamail >= 0:1.4
-Requires:       ws-commons-axiom
-Requires:       ws-commons-neethi
-Requires:       wsdl4j
-Requires:       wstx
-Requires:       xmlbeans
 
 %description samples
 %{summary}.
-%endif
 
 %package soapmonitor
 Summary:        Soap-Monitor module from %{name}
@@ -637,6 +600,25 @@
 %description spring
 %{summary}.
 
+%package testutils
+Summary:        Testutils module from %{name}
+Group:          Development/Libraries/Java
+Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
+Requires:       junit44
+
+%description testutils
+%{summary}.
+
+%package transport
+Summary:        Transport module from %{name}
+Group:          Development/Libraries/Java
+Requires:       %{name}-poms = %{epoch}:%{version}-%{release}
+Requires:       %{name}-kernel = %{epoch}:%{version}-%{release}
+Requires:       hc-httpcore
+
+%description transport
+%{summary}.
+
 %package xmlbeans
 Summary:        Xmlbeans module from %{name}
 Group:          Development/Libraries/Java
@@ -668,7 +650,7 @@
 Requires:       ws-commons-neethi
 Requires:       ws-commons-XmlSchema
 Requires:       wsdl4j
-Requires:       wstx
+Requires:       wstx32
 
 %description ant-plugin
 %{summary}.
@@ -732,7 +714,7 @@
 Requires(post): ws-commons-XmlSchema
 Requires(post): ws-woden >= 0:1.0-0.m8
 Requires(post): wsdl4j >= 0:1.6.2
-Requires(post): wstx
+Requires(post): wstx32
 Requires(post): xmlbeans >= 0:2.1.0
 
 Requires:       eclipse-platform >= 0:3.2.0
@@ -791,8 +773,6 @@
 %prep
 %setup -q -n %{name}
 cp %{SOURCE1} settings.xml
-#cp %{SOURCE8} modules/samples/pom.xml
-#cp %{SOURCE9} modules/soapmonitor/pom.xml
 
 %if %{without_maven}
 gzip -dc %{SOURCE11} | tar xf -
@@ -803,28 +783,12 @@
 find . -name "*.zip" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
 
-%patch0 -b .noidea
-%if ! %{with_eclipse}
-%patch1 -b .noeclipse
-%endif
 
+%patch0 -b .sav0
+%patch1 -b .sav1
 %patch2 -b .sav2
 %patch3 -b .sav3
 %patch4 -b .sav4
-%patch5 -b .sav5
-%patch6 -b .sav6
-%patch7 -b .sav7
-%patch8 -b .sav8
-%patch9 -b .sav9
-%patch10 -b .sav10
-%patch11 -b .sav11
-%patch12 -b .sav12
-%patch13 -b .sav13
-%patch14 -b .sav14
-%patch15 -b .sav15
-%patch16 -b .sav16
-%patch17 -b .sav17
-%patch18 -b .sav18
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -868,6 +832,17 @@
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
 
+pushd modules/resource-bundle
+mvn-jpp \
+        -e \
+%if %{without_tests}
+        -Dmaven.test.skip=true \
+%endif
+        -s ${MAVEN_SETTINGS} \
+        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        install 
+popd
 pushd modules/tool/axis2-mar-maven-plugin
 mvn-jpp \
         -e \
@@ -878,7 +853,6 @@
         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install 
-#       install javadoc:javadoc
 popd
 pushd modules/tool/axis2-aar-maven-plugin
 mvn-jpp \
@@ -890,36 +864,22 @@
         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install 
-#       install javadoc:javadoc
 popd
 mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
-mkdir -p $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/%{version}/
 cp modules/tool/axis2-mar-maven-plugin/pom.xml \
-   $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/%{version}/axis2-mar-maven-plugin-%{version}.maven-plugin
-cp modules/tool/axis2-mar-maven-plugin/pom.xml \
-   $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/%{version}/axis2-mar-maven-plugin-%{version}.pom
+   $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/JPP.axis2-mar-maven-plugin.pom
+cp modules/tool/axis2-aar-maven-plugin/pom.xml \
+   $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/JPP.axis2-aar-maven-plugin.pom
+
+mkdir -p $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/%{version}/
 ln -sf $(pwd)/modules/tool/axis2-mar-maven-plugin/target/axis2-mar-maven-plugin-%{version}.jar \
    $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/%{version}/axis2-mar-maven-plugin-%{version}.jar
-mkdir -p $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/2.0.8/
-cp modules/tool/axis2-mar-maven-plugin/pom.xml \
-   $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/2.0.8/axis2-mar-maven-plugin-2.0.8.maven-plugin
-cp modules/tool/axis2-mar-maven-plugin/pom.xml \
-   $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/2.0.8/axis2-mar-maven-plugin-2.0.8.pom
-ln -sf $(pwd)/modules/tool/axis2-mar-maven-plugin/target/axis2-mar-maven-plugin-%{version}.jar \
-   $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-mar-maven-plugin/2.0.8/axis2-mar-maven-plugin-2.0.8.jar
 
 mkdir -p $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-aar-maven-plugin/%{version}/
 cp modules/tool/axis2-aar-maven-plugin/pom.xml \
    $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-aar-maven-plugin/%{version}/axis2-aar-maven-plugin-%{version}.pom
 ln -sf $(pwd)/modules/tool/axis2-aar-maven-plugin/target/axis2-aar-maven-plugin-%{version}.jar \
    $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-aar-maven-plugin/%{version}/axis2-aar-maven-plugin-%{version}.jar
-mkdir -p $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-aar-maven-plugin/2.0.8/
-cp modules/tool/axis2-aar-maven-plugin/pom.xml \
-   $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-aar-maven-plugin/2.0.8/axis2-aar-maven-plugin-2.0.8.maven-plugin
-cp modules/tool/axis2-aar-maven-plugin/pom.xml \
-   $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-aar-maven-plugin/2.0.8/axis2-aar-maven-plugin-2.0.8.pom
-ln -sf $(pwd)/modules/tool/axis2-aar-maven-plugin/target/axis2-aar-maven-plugin-2.0.8.jar \
-   $MAVEN_REPO_LOCAL/org/apache/axis2/axis2-aar-maven-plugin/2.0.8/axis2-aar-maven-plugin-2.0.8.jar
 
 export MAVEN_OPTS="-Xmx256M"
 
@@ -935,7 +895,6 @@
         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         install
-#       ant:ant install javadoc:javadoc
 
 mvn-jpp \
         -e \
@@ -956,7 +915,7 @@
 ws-commons-axiom-api \
 ws-commons-axiom-impl \
 ws-commons-XmlSchema \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 )
 ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
 popd
@@ -981,7 +940,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 )
 CLASSPATH=$CLASSPATH:../java2wsdl/target/axis2-java2wsdl-%{version}.jar
 CLASSPATH=$CLASSPATH:target/classes:target/test-classes
@@ -1002,7 +961,7 @@
 ws-commons-axiom-dom \
 ws-commons-axiom-impl \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xmlunit \
 )
 CLASSPATH=$CLASSPATH:../java2wsdl/target/axis2-java2wsdl-%{version}.jar
@@ -1034,7 +993,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xmlbeans/xbean \
 xmlunit \
 )
@@ -1064,7 +1023,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xalan-j2-serializer \
 xmlbeans/xbean \
 xmlunit \
@@ -1085,7 +1044,7 @@
 ws-commons-neethi \
 ws-commons-XmlSchema \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 )
 CLASSPATH=$CLASSPATH:../kernel/target/axis2-kernel-%{version}.jar
 CLASSPATH=$CLASSPATH:target/classes:target/schema/classes:target/test-classes
@@ -1108,7 +1067,7 @@
 ws-commons-axiom-impl \
 ws-commons-XmlSchema \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 )
 CLASSPATH=$CLASSPATH:../java2wsdl/target/axis2-java2wsdl-%{version}.jar
 CLASSPATH=$CLASSPATH:../kernel/target/axis2-kernel-%{version}.jar
@@ -1142,7 +1101,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xalan-j2-serializer \
 xmlbeans/xbean \
 xpp3 \
@@ -1178,7 +1137,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xmlunit \
 )
 CLASSPATH=$CLASSPATH:../java2wsdl/target/axis2-java2wsdl-%{version}.jar
@@ -1208,7 +1167,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xmlunit \
 )
 CLASSPATH=$CLASSPATH:../java2wsdl/target/axis2-java2wsdl-%{version}.jar
@@ -1243,7 +1202,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xmlunit \
 )
 CLASSPATH=$CLASSPATH:../java2wsdl/target/axis2-java2wsdl-%{version}.jar
@@ -1273,7 +1232,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xalan-j2-serializer \
 xmlbeans/xbean \
 xmlunit \
@@ -1336,7 +1295,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xmlbeans/xbean \
 )
 CLASSPATH=$CLASSPATH:../../java2wsdl/target/axis2-java2wsdl-%{version}.jar
@@ -1385,7 +1344,7 @@
 ws-commons-axiom-impl \
 ws-commons-XmlSchema \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xalan-j2-serializer \
 xmlunit \
 )
@@ -1453,7 +1412,7 @@
 ws-commons-neethi \
 ws-woden \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 xalan-j2 \
 xalan-j2-serializer \
 )
@@ -1478,7 +1437,7 @@
 ws-commons-axiom-impl \
 ws-commons-neethi \
 wsdl4j \
-wstx/wstx-asl \
+wstx32/wstx-asl \
 )
 CLASSPATH=$CLASSPATH:../kernel/target/axis2-kernel-%{version}.jar
 CLASSPATH=$CLASSPATH:../saaj/target/axis2-saaj-%{version}.jar
@@ -1521,7 +1480,7 @@
 
 
 pushd modules
-  %add_to_maven_depmap org.apache.%{name} %{name}-parent %{version} JPP.%{name} parent
+  %add_to_maven_depmap org.apache.%{name} %{name}-parent %{version} JPP/%{name} parent
   install -m 644 parent/pom.xml \
         $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-parent.pom
 
@@ -1543,67 +1502,84 @@
                    kernel \
                    metadata \
                    mtompolicy \
+                   resource-bundle \
                    saaj \
-%if %{with_maven}
-                   samples \
-%endif
                    spring \
+                   testutils \
                    xmlbeans ; do
     install -m 644 $module/target/%{name}-$module-%{version}.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}/$module-%{version}.jar
-    %add_to_maven_depmap org.apache.%{name} %{name}-$module %{version} JPP.%{name} $module
+    %add_to_maven_depmap org.apache.%{name} %{name}-$module %{version} JPP/%{name} $module
     install -m 644 $module/pom.xml \
         $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-$module.pom
   done
 
-  install -m 644 soapmonitor/target/soapmonitor-%{version}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{name}/soapmonitor-%{version}.jar
-  %add_to_maven_depmap org.apache.%{name} soapmonitor %{version} JPP.%{name} soapmonitor
-
-  install -m 644 jws-api/target/%{name}-jws-api-%{version}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{name}-jws-api-%{version}.jar
-  %add_to_maven_depmap javax.xml.ws jws-api 2.0 JPP %{name}-jws-api
-  install -m 644 jws-api/pom.xml \
-        $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-jws-api.pom
-
-  install -m 644 jaxws-api/target/%{name}-jaxws-api-%{version}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{name}-jaxws-2.0-api-%{version}.jar
-  %add_to_maven_depmap javax.xml.ws jaxws-api 2.0 JPP %{name}-jaxws-2.0-api
-  install -m 644 jaxws-api/pom.xml \
-        $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-jaxws-2.0-api.pom
-
-  install -m 644 saaj-api/target/%{name}-saaj-api-%{version}.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{name}-saaj-1.1-api-%{version}.jar
-  %add_to_maven_depmap javax.xml.soap saaj-api 1.1 JPP %{name}-saaj-1.1-api
-  install -m 644 saaj-api/pom.xml \
-        $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-saaj-1.1-api.pom
+  pushd transport
+    install -m 644 http/target/%{name}-transport-http-%{version}.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}/transport-http-%{version}.jar
+    install -m 644 http/pom.xml \
+      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-transport-http.pom
+    %add_to_maven_depmap org.apache.%{name} transport-http %{version} JPP/%{name} transport-http
+    install -m 644 local/target/%{name}-transport-local-%{version}.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}/transport-local-%{version}.jar
+    install -m 644 local/pom.xml \
+      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-transport-local.pom
+    %add_to_maven_depmap org.apache.%{name} transport-local %{version} JPP/%{name} transport-local
+  popd
+
+    install -m 644 osgi/target/org.apache.axis2.osgi-%{version}.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}/org.apache.axis2.osgi-%{version}.jar
+    install -m 644 osgi/pom.xml \
+      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-org.apache.axis2.osgi.pom
+    %add_to_maven_depmap org.apache.%{name} org.apache.axis2.osgi %{version} JPP/%{name} org.apache.axis2.osgi
+
+
+
+  install -m 644 soapmonitor/servlet/target/%{name}-soapmonitor-servlet-%{version}.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}/soapmonitor-servlet-%{version}.jar
+  %add_to_maven_depmap org.apache.%{name} soapmonitor-servlet %{version} JPP/%{name} soapmonitor-servlet
 
-  install -m 644 mex/target/mex-%{version}.jar \
+  install -m 644 addressing/target/addressing-%{version}-classpath-module.jar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}/addressing-%{version}.jar
+  %add_to_maven_depmap org.apache.%{name} addressing %{version} JPP/%{name} addressing
+  install -m 644 addressing/pom.xml \
+        $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-addressing.pom
+
+  install -m 644 mex/target/mex-%{version}-classpath-module.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}/mex-%{version}.jar
   install -m 644 mex/target/mex-%{version}-impl.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}/mex-impl-%{version}.jar
-  %add_to_maven_depmap org.apache.%{name} mex %{version} JPP.%{name} mex
+  %add_to_maven_depmap org.apache.%{name} mex %{version} JPP/%{name} mex
   install -m 644 mex/pom.xml \
         $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-mex.pom
 
+  pushd samples
+    install -m 644 version/target/version-%{version}.aar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}/version-%{version}.aar
+    install -m 644 version/pom.xml \
+      $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-version.pom
+    %add_to_maven_depmap org.apache.%{name} version %{version} JPP/%{name} version
+  popd
+# BUILD/axis2/target/axis2-1.5.6.jar
   pushd tool
     install -m 644 %{name}-ant-plugin/target/%{name}-ant-plugin-%{version}.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}/ant-plugin-%{version}.jar
     install -m 644 %{name}-ant-plugin/pom.xml \
       $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-maven2-ant-plugin.pom
-    %add_to_maven_depmap org.apache.%{name} %{name}-ant-plugin %{version} JPP.%{name} ant-plugin
+    %add_to_maven_depmap org.apache.%{name} %{name}-ant-plugin %{version} JPP/%{name} ant-plugin
 
 %if %{with_maven}
     install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}/maven2
     for mp in aar-maven-plugin \
               mar-maven-plugin \
+              repo-maven-plugin \
               java2wsdl-maven-plugin \
               wsdl2code-maven-plugin ; do
       install -m 644 %{name}-${mp}/target/%{name}-${mp}-%{version}.jar \
         $RPM_BUILD_ROOT%{_javadir}/%{name}/maven2/${mp}-%{version}.jar
       install -m 644 %{name}-${mp}/pom.xml \
         $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-maven2-$mp.pom
-      %add_to_maven_depmap org.apache.%{name} %{name}-$mp %{version} JPP.%{name} $mp
+      %add_to_maven_depmap org.apache.%{name} %{name}-$mp %{version} JPP/%{name} $mp
     done
 %endif
 %if %{with_eclipse}
@@ -1614,7 +1590,7 @@
 %endif
   popd
 popd
-install -m 644 target/lib/%{name}-%{version}.jar \
+install -m 644 target/%{name}-%{version}.jar \
         $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 
 %if %{with_maven}
@@ -1652,30 +1628,27 @@
 %endif
    popd
 popd
-touch $RPM_BUILD_ROOT%{_javadir}/jaxws_2_0_api.jar
-touch $RPM_BUILD_ROOT%{_javadir}/jaxws_api.jar
-touch $RPM_BUILD_ROOT%{_javadir}/saaj_1_1_api.jar
-touch $RPM_BUILD_ROOT%{_javadir}/saaj_api.jar
-touch $RPM_BUILD_ROOT%{_javadir}/ws_metadata_api.jar
-touch $RPM_BUILD_ROOT%{_javadir}/ws_metadata_2_0_api.jar
 
 
 %if %{with_maven}
 ### Mar files
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}/modules
+
 pushd modules
-  install -m 644 scripting/target/%{name}-scripting-%{version}.mar \
-    $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/scripting-%{version}.mar
   install -m 644 addressing/target/addressing-%{version}.mar \
     $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/addressing-%{version}.mar
+  install -m 644 jaxws-mar/target/%{name}-jaxws-mar-%{version}.mar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/jaxws-%{version}.mar
+  install -m 644 mex/target/mex-%{version}.mar \
+    $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/mex-%{version}.mar
+  install -m 644 mtompolicy-mar/target/mtompolicy-%{version}.mar \
+      $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/mtompolicy-%{version}.mar
   install -m 644 ping/target/ping-%{version}.mar \
     $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/ping-%{version}.mar
-  install -m 644 soapmonitor/target/soapmonitor-%{version}.mar \
+  install -m 644 scripting/target/scripting-%{version}.mar \
+    $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/scripting-%{version}.mar
+  install -m 644 soapmonitor/module/target/soapmonitor-%{version}.mar \
     $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/soapmonitor-%{version}.mar
-  install -m 644 kernel/target/smtpfault.mar \
-    $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/smtpfault-%{version}.mar
-  install -m 644 mex/target/mex-%{version}.mar \
-    $RPM_BUILD_ROOT%{_javadir}/%{name}/modules/mex-%{version}.mar
 
   pushd $RPM_BUILD_ROOT%{_javadir}/%{name}/modules
       for vmar in *.mar ; do
@@ -1688,13 +1661,13 @@
 
 ### Javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-    cp -pr modules/documentation/target/apidocs/* \
+    cp -pr modules/webapp/target/site/apidocs/* \
         $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
 
-### Manual
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-    cp -pr modules/documentation/target/site/* \
-        $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
+#### Manual
+#install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+#    cp -pr modules/documentation/target/site/* \
+#        $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 
 ### Webapps and Samples
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
@@ -1746,14 +1719,6 @@
 %endif
 %endif
 
-%if %{gcj_support}
-export CLASSPATH=$(build-classpath gnu-crypto)
-%{_bindir}/aot-compile-rpm \
-           --exclude /usr/share/axis2-%{version}/axis2-%{version}.war \
-           --exclude /usr/share/java/axis2-%{version}.jar
-
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1777,7 +1742,7 @@
              ws-commons-neethi \
              ws-commons-XmlSchema \
              ws-woden \
-             wstx/wstx-asl \
+             wstx32/wstx-asl \
              wsdl4j \
              xmlbeans/xbean
 
@@ -1809,53 +1774,11 @@
 %postun poms
 %update_maven_depmap
 
-%post jws-api
-/usr/sbin/update-alternatives --install %{_javadir}/ws_metadata_2_0_api.jar ws_metadata_2_0_api %{_javadir}/%{name}-jws-2.0-api.jar 20000
-/usr/sbin/update-alternatives --install %{_javadir}/ws_metadata_api.jar ws_metadata_api %{_javadir}/%{name}-jws-2.0-api.jar 20000
-
-%preun jws-api
-if [ "$1" = "0" ]; then
-    /usr/sbin/update-alternatives --remove ws_metadata_2_0_api %{_javadir}/%{name}-jws-2.0-api.jar
-    /usr/sbin/update-alternatives --remove ws_metadata_api %{_javadir}/%{name}-jws-2.0-api.jar
-fi
-
-%post jaxws-2.0-api
-/usr/sbin/update-alternatives --install %{_javadir}/jaxws_2_0_api.jar jaxws_2_0_api %{_javadir}/%{name}-jaxws-2.0-api.jar 20000
-/usr/sbin/update-alternatives --install %{_javadir}/jaxws_api.jar jaxws_api %{_javadir}/%{name}-jaxws-2.0-api.jar 20000
-
-%preun jaxws-2.0-api
-if [ "$1" = "0" ]; then
-    /usr/sbin/update-alternatives --remove jaxws_2_0_api %{_javadir}/%{name}-jaxws-2.0-api.jar
-    /usr/sbin/update-alternatives --remove jaxws_api %{_javadir}/%{name}-jaxws-2.0-api.jar
-fi
-
-%post saaj-1.1-api
-/usr/sbin/update-alternatives --install %{_javadir}/saaj_1_1_api.jar saaj_1_1_api %{_javadir}/%{name}-saaj-1.1-api.jar 10100
-/usr/sbin/update-alternatives --install %{_javadir}/saaj_api.jar saaj_api %{_javadir}/%{name}-saaj-1.1-api.jar 10100
-
-%preun saaj-1.1-api
-if [ "$1" = "0" ]; then
-    /usr/sbin/update-alternatives --remove saaj_1_1_api %{_javadir}/%{name}-saaj-1.1-api.jar
-    /usr/sbin/update-alternatives --remove saaj_api %{_javadir}/%{name}-saaj-1.1-api.jar
-fi
-
 %post
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
 
 %files
 %defattr(0644,root,root,0755)
@@ -1864,11 +1787,6 @@
 %dir %{_javadir}/%{name}
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
-%if %{gcj_support}
-%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/*.mar.*
-%endif
 
 %files poms
 %defattr(0644,root,root,0755)
@@ -1884,6 +1802,10 @@
 %{_javadir}/%{name}/adb-%{version}.jar
 %{_javadir}/%{name}/adb.jar
 
+%files addressing
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/addressing*.jar
+
 %files clustering
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/clustering*.jar
@@ -1914,12 +1836,6 @@
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/jaxbri*.jar
 
-%files jaxws-2.0-api
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-jaxws-2.0-api*.jar
-%ghost %{_javadir}/jaxws_2_0_api.jar
-%ghost %{_javadir}/jaxws_api.jar
-
 %files jaxws
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/jaxws*.jar
@@ -1932,12 +1848,6 @@
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/json*.jar
 
-%files jws-api
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-jws-api*.jar
-%ghost %{_javadir}/ws_metadata_2_0_api.jar
-%ghost %{_javadir}/ws_metadata_api.jar
-
 %files kernel
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/kernel*.jar
@@ -1957,16 +1867,23 @@
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/mtompolicy*.jar
 
-%files saaj-1.1-api
+%files osgi
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/org.apache.axis2.osgi*.jar
+
+%files resource-bundle
 %defattr(0644,root,root,0755)
-%{_javadir}/%{name}-saaj-1.1-api*.jar
-%ghost %{_javadir}/saaj_1_1_api.jar
-%ghost %{_javadir}/saaj_api.jar
+%{_javadir}/%{name}/resource-bundle*.jar
 
 %files saaj
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/saaj*.jar
 
+%files samples
+%defattr(0644,root,root,0755)
+%{_datadir}/%{name}-%{version}
+%{_javadir}/%{name}/version*.aar
+
 %files soapmonitor
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/soapmonitor*.jar
@@ -1975,6 +1892,14 @@
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/spring*.jar
 
+%files testutils
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/testutils*.jar
+
+%files transport
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/transport*.jar
+
 %files xmlbeans
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/xmlbeans*.jar
@@ -1995,13 +1920,6 @@
 %endif
 
 %if %{with_maven}
-%files samples
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/samples*.jar
-%{_datadir}/%{name}-%{version}/samples
-%endif
-
-%if %{with_maven}
 %files modules
 %defattr(0644,root,root,0755)
 %dir %{_javadir}/%{name}/modules
@@ -2033,17 +1951,21 @@
 %{_javadir}/%{name}/maven2/aar-maven-plugin*.jar
 %{_javadir}/%{name}/maven2/mar-maven-plugin*.jar
 %{_javadir}/%{name}/maven2/java2wsdl-maven-plugin*.jar
+%{_javadir}/%{name}/maven2/repo-maven-plugin*.jar
 %{_javadir}/%{name}/maven2/wsdl2code-maven-plugin*.jar
 %{_datadir}/maven2/plugins/*
 %endif
 
-%if %{with_maven}
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
-%endif
+#%if %{with_maven}
+#%files manual
+#%defattr(0644,root,root,0755)
+#%doc %{_docdir}/%{name}-%{version}
+#%endif
 
 %changelog
+* Thu Jan 10 2013 Ralph Apel <r.apel at r-apel.de> - 0:1.5.6-1
+- 1.5.6
+
 * Sat Nov 26 2011 Ralph Apel <r.apel at r-apel.de> - 0:1.4.1-3
 - Replace wstx32 with wstx