Author: [email protected]
Date: Mon Jun 6 16:30:18 2011
New Revision: 1158
Log:
[AMDATUCASSANDRA-66] Added explicit versions on Amdatu import/export packages
Modified:
trunk/amdatu-cassandra/cassandra-application/pom.xml
trunk/amdatu-cassandra/cassandra-listener/pom.xml
trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml
trunk/amdatu-cassandra/cassandra-store-token/pom.xml
trunk/amdatu-cassandra/cassandra-tenantstore/pom.xml
trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
Modified: trunk/amdatu-cassandra/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-application/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-application/pom.xml Mon Jun 6
16:30:18 2011
@@ -129,11 +129,15 @@
*
</Import-Package>
<Export-Package>
- org.amdatu.cassandra.application,
- org.apache.cassandra.thrift,
- org.apache.cassandra.service,
+ org.amdatu.cassandra.application;version="1.0.0",
+ org.apache.cassandra.concurrent,
org.apache.cassandra.config,
org.apache.cassandra.db,
+ org.apache.cassandra.db.commitlog,
+ org.apache.cassandra.io.util,
+ org.apache.cassandra.service,
+ org.apache.cassandra.thrift,
+ org.apache.cassandra.utils,
org.apache.thrift.*
</Export-Package>
</instructions>
Modified: trunk/amdatu-cassandra/cassandra-listener/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-listener/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-listener/pom.xml Mon Jun 6 16:30:18 2011
@@ -52,7 +52,15 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.listener.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.listener</Bundle-SymbolicName>
- <Export-Package>org.amdatu.cassandra.listener</Export-Package>
+ <Import-Package>
+ org.amdatu.cassandra.application;version="[1.0,2.0)",
+ org.amdatu.cassandra.listener;version="[1.0,1.1)",
+ org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
+ *
+ </Import-Package>
+ <Export-Package>
+ org.amdatu.cassandra.listener;version="1.0.0"
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml Mon Jun 6
16:30:18 2011
@@ -71,13 +71,30 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.persistencemanager.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.persistencemanager</Bundle-SymbolicName>
+ <Import-Package>
+ org.amdatu.cassandra.application;version="[1.0,2.0)",
+ org.amdatu.cassandra.persistencemanager;version="[1.0,1.1)",
+ !com.eaio.uuid,
+ !com.ibm.uvm.tools,
+ !com.sun.jdmk.comm,
+ !com.sun.xml.fastinfoset.stax,
+ !javax.jmdns,
+ !javax.jms,
+ !javax.mail,
+ !javax.mail.internet,
+ !org.apache.commons.jexl,
+ !org.apache.commons.jexl.context,
+ !org.apache.commons.logging,
+ !org.aspectj.lang,
+ !org.aspectj.lang.annotation,
+ *
+ </Import-Package>
<Export-Package>
- org.amdatu.cassandra.persistencemanager,
+ org.amdatu.cassandra.persistencemanager;version="1.0.0",
me.prettyprint.hector.api.beans;version="0.7.0"
</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Import-Package>*;resolution:=optional</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-store-consumer/pom.xml Mon Jun 6
16:30:18 2011
@@ -83,9 +83,31 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.store.consumer.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.store.consumer</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.cassandra.store.consumer</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+ org.amdatu.cassandra.application;version="[1.0,2.0)",
+ org.amdatu.cassandra.listener;version="[1.0,2.0)",
+ org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
+ !com.ibm.uvm.tools,
+ !com.sun.jdmk.comm,
+ !javax.jmdns,
+ !javax.jms,
+ !javax.mail,
+ !javax.mail.internet,
+ !org.apache.commons.jexl,
+ !org.apache.commons.jexl.context,
+ !org.apache.commons.logging,
+ !org.aspectj.lang,
+ !org.aspectj.lang.annotation,
+ !org.apache.avalon.framework.logger,
+ !org.apache.log,
+ !org.codehaus.jackson,
+ !org.codehaus.jackson.map,
+ !org.codehaus.jackson.map.type,
+ !org.codehaus.jackson.type,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-cassandra/cassandra-store-token/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-store-token/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-store-token/pom.xml Mon Jun 6
16:30:18 2011
@@ -86,7 +86,6 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.store.token.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.store.token</Bundle-SymbolicName>
- <Export-Package>org.amdatu.cassandra.store.token</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified: trunk/amdatu-cassandra/cassandra-tenantstore/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-tenantstore/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-tenantstore/pom.xml Mon Jun 6
16:30:18 2011
@@ -62,6 +62,12 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.tenantstore.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.tenantstore</Bundle-SymbolicName>
+ <Import-Package>
+ org.amdatu.cassandra.application;version="[1.0,2.0)",
+ org.amdatu.cassandra.listener;version="[1.0,2.0)",
+ org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
+ *
+ </Import-Package>
<Export-Package />
</instructions>
</configuration>
Modified: trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-useradminstore/pom.xml Mon Jun 6
16:30:18 2011
@@ -95,7 +95,15 @@
<instructions>
<Bundle-Activator>org.amdatu.cassandra.useradminstore.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.cassandra.useradminstore</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.cassandra.useradminstore</Export-Package>
+ <Import-Package>
+ org.amdatu.cassandra.application;version="[1.0,2.0)",
+ org.amdatu.cassandra.listener;version="[1.0,2.0)",
+ org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
+ *
+ </Import-Package>
+ <Export-Package>
+ org.amdatu.cassandra.useradminstore;version"1.0.0"
+ </Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Mon Jun 6 16:30:18 2011
@@ -392,4 +392,83 @@
</plugins>
</reporting>
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+
+ <taskdef
resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.compile.classpath"/>
+ <available
file="${project.build.directory}/${project.build.finalName}.jar"
property="fileExists" value="true"/>
+ <available file="../config-fileinstall"
property="configFileDirExists" value="true"/>
+
+ <if>
+ <isset property="fileExists" />
+ <then>
+ <if>
+ <equals arg1="${amdatu.deploy.directory}" arg2="" />
+ <then>
+ <echo message="Property amdatu.deploy.directory
not defined, skipping copy to deploy dir task"/>
+ </then>
+ <else>
+ <copy
+
file="${project.build.directory}/${project.build.finalName}.jar"
+
tofile="${amdatu.deploy.directory}/${project.artifactId}-${project.version}.jar"
+ overwrite="true" />
+
+ <if>
+ <isset property="configFileDirExists" />
+ <then>
+ <copy todir="${amdatu.deploy.directory}"
overwrite="false">
+ <fileset dir="../config-fileinstall"/>
+ </copy>
+ </then>
+ </if>
+ </else>
+ </if>
+ </then>
+ </if>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml (original)
+++ trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml Mon Jun 6
16:30:18 2011
@@ -100,6 +100,12 @@
<Bundle-Activator>org.amdatu.test.performance.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.test.performance-bundle</Bundle-SymbolicName>
<Embed-Dependency>json,utilities;scope=compile</Embed-Dependency>
+ <Import-Package>
+ org.amdatu.cassandra.application;version="[1.0,2.0)",
+ org.amdatu.cassandra.listener;version="[1.0,2.0)",
+ org.amdatu.cassandra.persistencemanager;version="[1.0,2.0)",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
