You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2009/05/02 16:05:11 UTC
svn commit: r770956 - in /synapse/trunk/java: ./ modules/core/
modules/experimental/ modules/extensions/ modules/handler/ modules/samples/
modules/tasks/ modules/transports/ modules/transports/core/nhttp/
modules/transports/core/pipe/ modules/transport...
Author: ruwan
Date: Sat May 2 14:05:11 2009
New Revision: 770956
URL: http://svn.apache.org/viewvc?rev=770956&view=rev
Log:
Bundle meta info fixes
Modified:
synapse/trunk/java/modules/core/pom.xml
synapse/trunk/java/modules/experimental/pom.xml
synapse/trunk/java/modules/extensions/pom.xml
synapse/trunk/java/modules/handler/pom.xml
synapse/trunk/java/modules/samples/pom.xml
synapse/trunk/java/modules/tasks/pom.xml
synapse/trunk/java/modules/transports/core/nhttp/pom.xml
synapse/trunk/java/modules/transports/core/pipe/pom.xml
synapse/trunk/java/modules/transports/core/vfs/pom.xml
synapse/trunk/java/modules/transports/optional/fix/pom.xml
synapse/trunk/java/modules/transports/pom.xml
synapse/trunk/java/modules/utils/pom.xml
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/pom.xml (original)
+++ synapse/trunk/java/modules/core/pom.xml Sat May 2 14:05:11 2009
@@ -135,54 +135,28 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.3.0</Bundle-Version>
- <Bundle-Name>org.apache.synapse.core</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>org.apache.synapse.core</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
- !org.apache.synapse.transport.*,
- !org.apache.synapse.format.*,
- org.apache.synapse.*;-split-package:=merge-last,
+ org.apache.synapse,
+ org.apache.synapse.aspects.*,
+ org.apache.synapse.config.*,
+ org.apache.synapse.core.*,
+ org.apache.synapse.endpoints.*,
+ org.apache.synapse.eventing.*,
+ org.apache.synapse.mediators.*,
+ org.apache.synapse.metrics.*,
+ org.apache.synapse.registry.*,
+ org.apache.synapse.security.*,
+ org.apache.synapse.startup.*,
+ org.apache.synapse.util.*,
</Export-Package>
<Import-Package>
!javax.xml.namespace,
- !javax.xml.soap,
- !org.apache.woden.*,
- !org.apache.commons.io,
javax.xml.namespace; version=0.0.0,
- javax.activation,
- javax.crypto,
- javax.mail.internet,
- javax.naming,
- javax.servlet,
- javax.servlet.http,
- javax.sql,
- javax.wsdl.*,
- javax.xml.parsers,
+ !javax.xml.soap,
javax.xml.soap; version=0.0.0,
- javax.xml.stream,
- javax.xml.transform.*,
- javax.xml.validation,
- org.apache.axiom.*,
- org.apache.axis2.*,
- org.apache.commons.dbcp,
- org.apache.commons.dbcp.datasources,
+ !org.apache.commons.io,
org.apache.commons.io; version=0.0.0,
- org.apache.commons.logging,
- org.apache.log4j,
- org.apache.neethi,
- org.apache.synapse.transport.*,
- org.apache.synapse.format.*,
- org.apache.woden.*; version=0.0.0,
- org.apache.ws.commons.schema.resolver,
- org.jaxen.*,
- org.quartz.*,
- javax.transaction.*,
- org.springframework.xml.transform,
- org.w3c.dom,
- org.wso2.caching.*,
- org.xml.sax.*,
*;resolution:=optional,
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -190,11 +164,6 @@
</configuration>
</plugin>
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
</build>
<dependencies>
@@ -214,51 +183,5 @@
<groupId>org.apache.synapse</groupId>
<artifactId>synapse-vfs-transport</artifactId>
</dependency>
-
- <!-- Rampart
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-policy</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-trust</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.rampart</groupId>
- <artifactId>rampart-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- </dependency>
-
- <- This is used by the CacheMediator. TODO: since axis2-saaj is based on
- Axiom, it should not be necessary to rely on SAAJ and we should try
- to eliminate this dependency. ->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-jms</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-mail</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <scope>test</scope>
- </dependency-->
</dependencies>
</project>
Modified: synapse/trunk/java/modules/experimental/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/experimental/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/experimental/pom.xml (original)
+++ synapse/trunk/java/modules/experimental/pom.xml Sat May 2 14:05:11 2009
@@ -35,7 +35,32 @@
<name>Apache Synapse - Experimental code</name>
<description>Apache Synapse - Experimental code (use at your own risk!)</description>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
+ <Export-Package>
+ org.apache.synapse.experimental.*,
+ </Export-Package>
+ <Import-Package>
+ !javax.xml.namespace,
+ javax.xml.namespace; version=0.0.0,
+ *;resolution:=optional,
+ </Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
@@ -43,4 +68,5 @@
<artifactId>synapse-core</artifactId>
</dependency>
</dependencies>
+
</project>
Modified: synapse/trunk/java/modules/extensions/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/pom.xml (original)
+++ synapse/trunk/java/modules/extensions/pom.xml Sat May 2 14:05:11 2009
@@ -53,11 +53,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.3.0</Bundle-Version>
- <Bundle-Name>org.apache.synapse.extension</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>org.apache.synapse.extension</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
org.apache.synapse.format.hessian.*,
org.apache.synapse.format.syslog.*,
@@ -69,17 +65,6 @@
<Import-Package>
!javax.xml.namespace,
javax.xml.namespace; version=0.0.0,
- javax.xml.stream,
- javax.xml.transform.dom,
- javax.xml.transform.stream,
- org.apache.axiom.*,
- org.apache.axis2.*,
- org.apache.commons.logging,
- org.apache.neethi,
- org.apache.synapse.*,
- org.jaxen,
- org.w3c.dom,
- org.xml.sax,
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: synapse/trunk/java/modules/handler/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/handler/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/handler/pom.xml (original)
+++ synapse/trunk/java/modules/handler/pom.xml Sat May 2 14:05:11 2009
@@ -48,11 +48,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.3.0</Bundle-Version>
- <Bundle-Name>org.apache.synapse.handlers</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>org.apache.synapse.handlers</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Private-Package>
org.apache.synapse.handler.util,
org.apache.synapse.handler,
@@ -61,21 +57,6 @@
!*,
</Export-Package>
<Import-Package>
- org.apache.axiom.attachments,
- org.apache.axiom.soap,
- org.apache.axis2,
- org.apache.axis2.addressing,
- org.apache.axis2.context,
- org.apache.axis2.description,
- org.apache.axis2.engine,
- org.apache.axis2.handlers,
- org.apache.axis2.modules,
- org.apache.commons.logging,
- org.apache.neethi,
- org.apache.synapse,
- org.apache.synapse.config,
- org.apache.synapse.core,
- org.apache.synapse.core.axis2,
*;resolution:=optional,
</Import-Package>
</instructions>
Modified: synapse/trunk/java/modules/samples/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/pom.xml (original)
+++ synapse/trunk/java/modules/samples/pom.xml Sat May 2 14:05:11 2009
@@ -396,11 +396,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.3.0</Bundle-Version>
- <Bundle-Name>${pom.artifactId}</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Private-Package>samples.*</Private-Package>
</instructions>
</configuration>
Modified: synapse/trunk/java/modules/tasks/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/tasks/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/tasks/pom.xml (original)
+++ synapse/trunk/java/modules/tasks/pom.xml Sat May 2 14:05:11 2009
@@ -53,26 +53,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.3.0</Bundle-Version>
- <Bundle-Name>org.apache.synapse.task</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>org.apache.synapse.tasks</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
- org.apache.synapse.task.*;-split-package:=merge-last,
+ org.apache.synapse.task.*,
</Export-Package>
<Import-Package>
- !javax.xml.namespace,
- org.apache.axiom.*,
- org.apache.commons.logging,
- org.apache.log4j,
- javax.xml.namespace; version=0.0.0,
- org.apache.synapse.utils.*,
- org.apache.commons.io.*,
- org.quartz.*,
- javax.transaction.*,
- org.apache.axiom.*,
- org.apache.commons.collections.*,
+ !javax.xml.namespace,
+ javax.xml.namespace; version=0.0.0,
*;resolution:=optional,
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: synapse/trunk/java/modules/transports/core/nhttp/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/pom.xml Sat May 2 14:05:11 2009
@@ -45,13 +45,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.0</Bundle-Version>
- <Bundle-Name>${pom.artifactId}</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
- org.apache.synapse.transport.nhttp.*;-split-package:=merge-last,
+ org.apache.synapse.transport.nhttp.*,
</Export-Package>
<Import-Package>
!javax.xml.namespace,
Modified: synapse/trunk/java/modules/transports/core/pipe/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/pipe/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/pipe/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/pipe/pom.xml Sat May 2 14:05:11 2009
@@ -45,17 +45,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.0</Bundle-Version>
- <Bundle-Name>${pom.artifactId}</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
- org.apache.synapse.transport.pipe.*;-split-package:=merge-last,
+ org.apache.synapse.transport.pipe.*,
</Export-Package>
<Import-Package>
- !javax.xml.namespace,
- javax.xml.namespace; version=0.0.0,
*; resolution:=optional
</Import-Package>
</instructions>
Modified: synapse/trunk/java/modules/transports/core/vfs/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/vfs/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/vfs/pom.xml (original)
+++ synapse/trunk/java/modules/transports/core/vfs/pom.xml Sat May 2 14:05:11 2009
@@ -45,13 +45,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.0</Bundle-Version>
- <Bundle-Name>${pom.artifactId}</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
- org.apache.synapse.transport.vfs.*;-split-package:=merge-last,
+ org.apache.synapse.transport.vfs.*,
</Export-Package>
<Import-Package>
!javax.xml.namespace,
Modified: synapse/trunk/java/modules/transports/optional/fix/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/optional/fix/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/optional/fix/pom.xml (original)
+++ synapse/trunk/java/modules/transports/optional/fix/pom.xml Sat May 2 14:05:11 2009
@@ -45,13 +45,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.0</Bundle-Version>
- <Bundle-Name>${pom.artifactId}</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
- org.apache.synapse.transport.fix.*;-split-package:=merge-last,
+ org.apache.synapse.transport.fix.*,
</Export-Package>
<Import-Package>
!javax.xml.namespace,
Modified: synapse/trunk/java/modules/transports/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Sat May 2 14:05:11 2009
@@ -36,100 +36,6 @@
<description>Apache Synapse - Transports</description>
<packaging>pom</packaging>
- <!--build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <argLine>-javaagent:target/lib/aspectjweaver-${aspectj.version}.jar -Xms64m -Xmx128m</argLine>
- <systemProperties>
- <property>
- <name>log4j.configuration</name>
- <value>file:log4j.properties</value>
- </property>
- </systemProperties>
- <excludes>
- <exclude>**/AbstractTransportTest.java</exclude>
- <exclude>org/apache/synapse/transport/mail/Test*.java</exclude>
- <exclude>org/apache/synapse/transport/testkit/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <- We need a repository with the addressing module for the UDP transport tests >
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>${aspectj.version}</version>
- <outputDirectory>target/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Version>1.3.0</Bundle-Version>
- <Bundle-Name>org.apache.synapse.transport</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>org.apache.synapse.transport</Bundle-SymbolicName>
- <Export-Package>
- org.apache.synapse.*;-split-package:=merge-last,
- </Export-Package>
- <Import-Package>
- !javax.xml.namespace,
- !org.apache.synapse.*,
- javax.xml.namespace; version=0.0.0,
- javax.activation,
- javax.jms,
- javax.mail,
- javax.mail.internet,
- javax.management,
- javax.naming,
- javax.net.ssl,
- javax.security.auth.x500,
- javax.xml.stream,
- org.apache.axiom.*,
- org.apache.axis2.*,
- org.apache.commons.io.*; version=0.0.0,
- org.apache.commons.logging,
- org.apache.commons.vfs.*,
- org.apache.http.params,
- org.apache.http.protocol,
- org.apache.http.nio.reactor,
- org.apache.http.nio,
- org.apache.ws.commons.schema,
- *;resolution:=optional,
- </Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build-->
-
<modules>
<module>core/nhttp</module>
<module>core/pipe</module>
Modified: synapse/trunk/java/modules/utils/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/pom.xml (original)
+++ synapse/trunk/java/modules/utils/pom.xml Sat May 2 14:05:11 2009
@@ -53,22 +53,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.3.0</Bundle-Version>
- <Bundle-Name>org.apache.synapse.util</Bundle-Name>
- <Bundle-Vendor>Apache Software Foundation</Bundle-Vendor>
- <Bundle-Description>${pom.description}</Bundle-Description>
- <Bundle-SymbolicName>org.apache.synapse.utils</Bundle-SymbolicName>
+ <Bundle-Version>${synapse.bundle.version}</Bundle-Version>
<Export-Package>
- org.apache.synapse.commons.util.*
+ org.apache.synapse.commons.util.*,
</Export-Package>
<Import-Package>
!javax.xml.namespace,
- !org.apache.commons.io,
- javax.xml.namespace; version=0.0.0,
- org.apache.axiom.*,
- org.apache.commons.logging,
- org.apache.log4j,
- org.apache.commons.io.*,
+ javax.xml.namespace; version=0.0.0,
*;resolution:=optional,
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=770956&r1=770955&r2=770956&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Sat May 2 14:05:11 2009
@@ -799,6 +799,7 @@
<properties>
<!-- Synapse and related components -->
<synapse.version>SNAPSHOT</synapse.version>
+ <synapse.bundle.version>0.0.0</synapse.bundle.version>
<commons.dbcp.version>1.2.2</commons.dbcp.version>
<commons.pool.version>1.3</commons.pool.version>
<commons.vfs.version>1.1-587797</commons.vfs.version>