Author: [email protected] Date: Wed Apr 20 18:09:15 2011 New Revision: 1015
Log: AMDATU-117 to new artifact naming scheme / preparing release Modified: trunk/amdatu-core/config-filebased/pom.xml trunk/amdatu-core/config-templates/pom.xml trunk/amdatu-core/loghandler/pom.xml trunk/amdatu-core/pom.xml trunk/amdatu-core/tenant/pom.xml trunk/amdatu-core/tenantstore-fs/pom.xml trunk/amdatu-core/tenantuseradmindecorator/pom.xml trunk/amdatu-core/useradmincache/pom.xml trunk/amdatu-core/useradminstore-fs/pom.xml Modified: trunk/amdatu-core/config-filebased/pom.xml ============================================================================== --- trunk/amdatu-core/config-filebased/pom.xml (original) +++ trunk/amdatu-core/config-filebased/pom.xml Wed Apr 20 18:09:15 2011 @@ -1,50 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <parent> - <artifactId>org.amdatu.core</artifactId> - <groupId>org.amdatu</groupId> - <version>0.2.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.amdatu.core.config</groupId> - <artifactId>filebased</artifactId> - <packaging>bundle</packaging> - <name>Amdatu Core - File Based Configuration</name> - <description>This bundle contains the configuration files of all Amdatu bundles and is repsonsible for registration of these configs in ConfigAdmin.</description> - - <build> - <finalName>${groupId}.${artifactId}-${project.version}</finalName> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>conf/*.*</exclude> - </excludes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>conf/*.*</include> - </includes> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.core.config.filebased.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.core.config.filebased</Bundle-SymbolicName> - <Private-Package>org.amdatu.core.config.filebased</Private-Package> - </instructions> - </configuration> - </plugin> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <parent> + <groupId>org.amdatu.core</groupId> + <artifactId>org.amdatu.core</artifactId> + <version>0.2.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>org.amdatu.core.config.filebased</artifactId> + <packaging>bundle</packaging> + <name>Amdatu Core - File Based Configuration</name> + <description>This bundle contains the configuration files of all Amdatu bundles and is repsonsible for registration of these configs in ConfigAdmin.</description> - </plugins> - </build> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>conf/*.*</include> + </includes> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.core.config.filebased.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.core.config.filebased</Bundle-SymbolicName> + <Private-Package>org.amdatu.core.config.filebased</Private-Package> + </instructions> + </configuration> + </plugin> + + </plugins> + </build> </project> \ No newline at end of file Modified: trunk/amdatu-core/config-templates/pom.xml ============================================================================== --- trunk/amdatu-core/config-templates/pom.xml (original) +++ trunk/amdatu-core/config-templates/pom.xml Wed Apr 20 18:09:15 2011 @@ -1,35 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.core.config</groupId> - <artifactId>templates</artifactId> + <artifactId>org.amdatu.core.config.templates</artifactId> <packaging>bundle</packaging> <name>Amdatu Core - Configuration Templates</name> - <description>The template manager can be used to replace configurable properties in any file with configuration properties provided by ConfigAdmin</description> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>conf/*.*</exclude> - </excludes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>conf/*.*</include> - </includes> - </resource> - </resources> - + <description>The template manager can be used to replace configurable properties in any file with configuration properties provided by ConfigAdmin</description> + + <build> + <plugins> <plugin> <groupId>org.apache.felix</groupId> @@ -46,6 +30,6 @@ </plugin> </plugins> - - </build> + + </build> </project> Modified: trunk/amdatu-core/loghandler/pom.xml ============================================================================== --- trunk/amdatu-core/loghandler/pom.xml (original) +++ trunk/amdatu-core/loghandler/pom.xml Wed Apr 20 18:09:15 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.core</groupId> - <artifactId>loghandler</artifactId> + <artifactId>org.amdatu.core.loghandler</artifactId> <packaging>bundle</packaging> <name>Amdatu Core - Log Handler</name> <description>The log handler provides several hooks to dispatch log entries from other logging frameworks (i.e. JDK logging) to the OSGi LogService</description> Modified: trunk/amdatu-core/pom.xml ============================================================================== --- trunk/amdatu-core/pom.xml (original) +++ trunk/amdatu-core/pom.xml Wed Apr 20 18:09:15 2011 @@ -5,10 +5,10 @@ <parent> <groupId>org.amdatu</groupId> <artifactId>amdatu</artifactId> - <version>1</version> + <version>2</version> <relativePath>../amdatu-parent/pom.xml</relativePath> </parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core</artifactId> <version>0.2.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -41,6 +41,7 @@ </repositories> <properties> + <org.amdatu.libraries.version>0.2.0</org.amdatu.libraries.version> <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version> </properties> Modified: trunk/amdatu-core/tenant/pom.xml ============================================================================== --- trunk/amdatu-core/tenant/pom.xml (original) +++ trunk/amdatu-core/tenant/pom.xml Wed Apr 20 18:09:15 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <packaging>bundle</packaging> <name>Amdatu Core - Tenant Service</name> <description>This bundle provides a tenant management service with tenant CRUD operations</description> @@ -15,9 +14,9 @@ <dependencies> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>utilities</artifactId> - <version>${project.version}</version> + <artifactId>org.amdatu.libraries.utilities</artifactId> <scope>test</scope> + <version>${org.amdatu.libraries.version}</version> <type>jar</type> </dependency> </dependencies> Modified: trunk/amdatu-core/tenantstore-fs/pom.xml ============================================================================== --- trunk/amdatu-core/tenantstore-fs/pom.xml (original) +++ trunk/amdatu-core/tenantstore-fs/pom.xml Wed Apr 20 18:09:15 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.core</groupId> - <artifactId>tenantstore-fs</artifactId> + <artifactId>org.amdatu.core.tenantstorefs</artifactId> <packaging>bundle</packaging> <name>Amdatu Core - Tenant Filesystem Backstore</name> <description>This bundle provides a filebased Tenant backstore</description> @@ -15,15 +14,15 @@ <dependencies> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>fsstorage</artifactId> - <version>${project.version}</version> + <artifactId>org.amdatu.libraries.fsstorage</artifactId> + <version>${org.amdatu.libraries.version}</version> <scope>compile</scope> </dependency> </dependencies> Modified: trunk/amdatu-core/tenantuseradmindecorator/pom.xml ============================================================================== --- trunk/amdatu-core/tenantuseradmindecorator/pom.xml (original) +++ trunk/amdatu-core/tenantuseradmindecorator/pom.xml Wed Apr 20 18:09:15 2011 @@ -3,12 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.core</groupId> - <artifactId>tenantuseradmindecorator</artifactId> + <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId> <version>0.2.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>Amdatu Core - Tenant UserAdmin Decorator</name> @@ -17,7 +16,7 @@ <dependencies> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> Modified: trunk/amdatu-core/useradmincache/pom.xml ============================================================================== --- trunk/amdatu-core/useradmincache/pom.xml (original) +++ trunk/amdatu-core/useradmincache/pom.xml Wed Apr 20 18:09:15 2011 @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.core</groupId> - <artifactId>useradmincache</artifactId> + <artifactId>org.amdatu.core.useradmincache</artifactId> <packaging>bundle</packaging> <name>Amdatu Core - UserAdmin Cache</name> <description>This bundle adds a caching layer to the UserAdmin service</description> Modified: trunk/amdatu-core/useradminstore-fs/pom.xml ============================================================================== --- trunk/amdatu-core/useradminstore-fs/pom.xml (original) +++ trunk/amdatu-core/useradminstore-fs/pom.xml Wed Apr 20 18:09:15 2011 @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.core</groupId> - <artifactId>useradminstore-fs</artifactId> + <artifactId>org.amdatu.core.useradminstorefs</artifactId> <packaging>bundle</packaging> <name>Amdatu Core - Useradmin filesystem storage</name> <description>This bundle provides filebased Useradmin storage</description> @@ -15,8 +15,8 @@ <dependencies> <dependency> <groupId>org.amdatu.libraries</groupId> - <artifactId>fsstorage</artifactId> - <version>${project.version}</version> + <artifactId>org.amdatu.libraries.fsstorage</artifactId> + <version>${org.amdatu.libraries.version}</version> <scope>compile</scope> </dependency> <dependency> @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
