Author: [email protected]
Date: Mon Jun 20 10:12:15 2011
New Revision: 1178
Log:
[AMDATUAUTH-23] Added explicit import/export package versions
Modified:
trunk/amdatu-auth/login-gadget/pom.xml
trunk/amdatu-auth/login-service/pom.xml
trunk/amdatu-auth/oauth-api/pom.xml
trunk/amdatu-auth/oauth-client/pom.xml
trunk/amdatu-auth/oauth-consumerregistry-fs/pom.xml
trunk/amdatu-auth/oauth-example/pom.xml
trunk/amdatu-auth/oauth-server/pom.xml
trunk/amdatu-auth/pom.xml
trunk/amdatu-auth/tokenprovider/pom.xml
trunk/amdatu-auth/tokenstore-mem/pom.xml
trunk/amdatu-auth/useradmin-gadget/pom.xml
trunk/amdatu-auth/useradmin-rest/pom.xml
Modified: trunk/amdatu-auth/login-gadget/pom.xml
==============================================================================
--- trunk/amdatu-auth/login-gadget/pom.xml (original)
+++ trunk/amdatu-auth/login-gadget/pom.xml Mon Jun 20 10:12:15 2011
@@ -90,6 +90,7 @@
<Bundle-SymbolicName>org.amdatu.auth.login.gadget</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-auth/login-service/pom.xml
==============================================================================
--- trunk/amdatu-auth/login-service/pom.xml (original)
+++ trunk/amdatu-auth/login-service/pom.xml Mon Jun 20 10:12:15 2011
@@ -74,7 +74,7 @@
<instructions>
<Bundle-Activator>org.amdatu.authorization.login.service.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.auth.login.service</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.authorization.login.service</Export-Package>
+
<Export-Package>org.amdatu.authorization.login.service;version="1.0.0"</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified: trunk/amdatu-auth/oauth-api/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-api/pom.xml (original)
+++ trunk/amdatu-auth/oauth-api/pom.xml Mon Jun 20 10:12:15 2011
@@ -92,9 +92,11 @@
!org.apache.log,
*
</Import-Package>
-
<Export-Package>org.amdatu.authentication.oauth.api</Export-Package>
+ <Export-Package>
+ org.amdatu.authentication.oauth.api;version="1.0.0"
+ </Export-Package>
<_exportcontents>
- net.oauth.*
+ net.oauth.*;version="1.0.0"
</_exportcontents>
</instructions>
</configuration>
Modified: trunk/amdatu-auth/oauth-client/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-client/pom.xml (original)
+++ trunk/amdatu-auth/oauth-client/pom.xml Mon Jun 20 10:12:15 2011
@@ -76,6 +76,8 @@
<Export-Package>org.amdatu.authentication.oauth.client</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Import-Package>
+ net.oauth;version="[1.0,2.0)",
+ org.amdatu.authentication.oauth.api;version="[1.0,2.0)",
!com.ibm.uvm.tools,
!com.sun.jdmk.comm,
!javax.jmdns,
@@ -85,6 +87,9 @@
!org.apache.log,
*
</Import-Package>
+ <Export-Package>
+ org.amdatu.authentication.oauth.client;version="1.0.0"
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-auth/oauth-consumerregistry-fs/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-consumerregistry-fs/pom.xml (original)
+++ trunk/amdatu-auth/oauth-consumerregistry-fs/pom.xml Mon Jun 20 10:12:15 2011
@@ -49,6 +49,11 @@
<Bundle-Activator>org.amdatu.authentication.oauth.consumerregistry.fs.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.auth.oauth.consumerregistry.fs</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Import-Package>
+ org.amdatu.authentication.oauth.api;version="[1.0,1.1)",
+ *
+ </Import-Package>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-auth/oauth-example/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-example/pom.xml (original)
+++ trunk/amdatu-auth/oauth-example/pom.xml Mon Jun 20 10:12:15 2011
@@ -98,6 +98,14 @@
<Bundle-Activator>org.amdatu.example.oauth.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.example.oauth</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Export-Package></Export-Package>
+ <Import-Package>
+ net.oauth.*;version="[1.0,2.0)",
+ org.amdatu.authentication.oauth.api;version="[1.0,1.1)",
+ org.amdatu.authentication.oauth.server;version="[1.0,2.0)",
+ org.amdatu.opensocial.gadgetmanagement,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-auth/oauth-server/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-server/pom.xml (original)
+++ trunk/amdatu-auth/oauth-server/pom.xml Mon Jun 20 10:12:15 2011
@@ -112,7 +112,15 @@
<instructions>
<Bundle-Activator>org.amdatu.authentication.oauth.server.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.auth.oauth.server</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.authentication.oauth.server</Export-Package>
+ <Import-Package>
+ net.oauth.*;version="[1.0,2.0)",
+ org.amdatu.authentication.oauth.api;version="[1.0,1.1)",
+ org.amdatu.authentication.tokenprovider;version="[1.0,1.1)",
+ *
+ </Import-Package>
+ <Export-Package>
+ org.amdatu.authentication.oauth.server;version="1.0.0"
+ </Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<DynamicImport-Package>
org.apache.log4j,
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Mon Jun 20 10:12:15 2011
@@ -303,72 +303,7 @@
</execution>
</executions>
</plugin>
- <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>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
@@ -425,4 +360,84 @@
</plugin>
</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-auth/tokenprovider/pom.xml
==============================================================================
--- trunk/amdatu-auth/tokenprovider/pom.xml (original)
+++ trunk/amdatu-auth/tokenprovider/pom.xml Mon Jun 20 10:12:15 2011
@@ -59,7 +59,9 @@
<instructions>
<Bundle-Activator>org.amdatu.authentication.tokenprovider.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.auth.tokenprovider</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.authentication.tokenprovider</Export-Package>
+ <Export-Package>
+ org.amdatu.authentication.tokenprovider;version="1.0.0"
+ </Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<DynamicImport-Package>
org.apache.log4j,
Modified: trunk/amdatu-auth/tokenstore-mem/pom.xml
==============================================================================
--- trunk/amdatu-auth/tokenstore-mem/pom.xml (original)
+++ trunk/amdatu-auth/tokenstore-mem/pom.xml Mon Jun 20 10:12:15 2011
@@ -44,7 +44,11 @@
<instructions>
<Bundle-Activator>org.amdatu.authentication.tokenstore.mem.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>org.amdatu.auth.tokenstore.mem</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.authentication.tokenstore.mem</Export-Package>
+ <Import-Package>
+ org.amdatu.authentication.tokenprovider;version="[1.0,1.1)",
+ *
+ </Import-Package>
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-auth/useradmin-gadget/pom.xml
==============================================================================
--- trunk/amdatu-auth/useradmin-gadget/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-gadget/pom.xml Mon Jun 20 10:12:15 2011
@@ -84,6 +84,10 @@
<Bundle-Activator>org.amdatu.authorization.useradmin.gadget.osgi.Activator</Bundle-Activator>
<Bundle-SymbolicName>
org.amdatu.auth.useradmin.gadget</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Import-Package>
+ org.amdatu.opensocial.gadgetmanagement,
+ *
+ <Export-Package></Export-Package>
</instructions>
</configuration>
</plugin>
Modified: trunk/amdatu-auth/useradmin-rest/pom.xml
==============================================================================
--- trunk/amdatu-auth/useradmin-rest/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-rest/pom.xml Mon Jun 20 10:12:15 2011
@@ -90,8 +90,14 @@
<Bundle-SymbolicName>org.amdatu.auth.useradmin.rest</Bundle-SymbolicName>
<Private-Package>org.amdatu.authorization.useradmin.rest.*,org.apache.wink.common.internal.uri</Private-Package>
<Embed-Dependency>json,org.amdatu.libraries.utilities;scope=compile</Embed-Dependency>
- <Export-Package>!*</Export-Package>
-
<Import-Package>!org.apache.wink.common.internal.*,*</Import-Package>
+ <Export-Package>
+ !*
+ </Export-Package>
+ <Import-Package>
+ org.amdatu.authentication.tokenprovider;version="[1.0,2.0)",
+ !org.apache.wink.common.internal.*,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
