Author: [email protected] Date: Thu Apr 21 09:37:09 2011 New Revision: 1026
Log: AMDATU-117 platform pom cleanup Modified: trunk/amdatu-core/config-filebased/pom.xml trunk/amdatu-core/config-templates/pom.xml trunk/amdatu-core/tenant/pom.xml trunk/amdatu-libraries/fsstorage/pom.xml trunk/amdatu-libraries/pom.xml trunk/amdatu-libraries/utilities/pom.xml trunk/amdatu-libraries/warsupport/pom.xml trunk/amdatu-web/dispatcher/pom.xml trunk/amdatu-web/httpcontext/pom.xml trunk/amdatu-web/jsp/pom.xml trunk/amdatu-web/pom.xml trunk/amdatu-web/rest-jaxrs/pom.xml trunk/amdatu-web/tenantresolver-hostname/pom.xml trunk/amdatu-web/tenantresolver-parameter/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 Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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";> +<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> Modified: trunk/amdatu-core/config-templates/pom.xml ============================================================================== --- trunk/amdatu-core/config-templates/pom.xml (original) +++ trunk/amdatu-core/config-templates/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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.core</groupId> @@ -12,7 +13,6 @@ <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> @@ -27,7 +27,6 @@ </instructions> </configuration> </plugin> - </plugins> </build> Modified: trunk/amdatu-core/tenant/pom.xml ============================================================================== --- trunk/amdatu-core/tenant/pom.xml (original) +++ trunk/amdatu-core/tenant/pom.xml Thu Apr 21 09:37:09 2011 @@ -15,9 +15,8 @@ <dependency> <groupId>org.amdatu.libraries</groupId> <artifactId>org.amdatu.libraries.utilities</artifactId> - <scope>test</scope> <version>${org.amdatu.libraries.version}</version> - <type>jar</type> + <scope>test</scope> </dependency> </dependencies> Modified: trunk/amdatu-libraries/fsstorage/pom.xml ============================================================================== --- trunk/amdatu-libraries/fsstorage/pom.xml (original) +++ trunk/amdatu-libraries/fsstorage/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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.libraries</groupId> @@ -10,7 +11,4 @@ <packaging>jar</packaging> <name>Amdatu Libraries - FSStorage</name> <description>Base and utility classes for components that use simple filesystem storage</description> - <build> - <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName> - </build> </project> Modified: trunk/amdatu-libraries/pom.xml ============================================================================== --- trunk/amdatu-libraries/pom.xml (original) +++ trunk/amdatu-libraries/pom.xml Thu Apr 21 09:37:09 2011 @@ -9,10 +9,10 @@ </parent> <groupId>org.amdatu.libraries</groupId> <artifactId>org.amdatu.libraries</artifactId> + <packaging>pom</packaging> <version>0.2.1-SNAPSHOT</version> <name>Amdatu Libraries</name> <description>This module consists of all Amdatu libraries. Amdatu libraries are a set of utility classes which should be embedded by bundles using them.</description> - <packaging>pom</packaging> <repositories> <repository> Modified: trunk/amdatu-libraries/utilities/pom.xml ============================================================================== --- trunk/amdatu-libraries/utilities/pom.xml (original) +++ trunk/amdatu-libraries/utilities/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,8 +1,9 @@ <?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.libraries</groupId> + <groupId>org.amdatu.libraries</groupId> <artifactId>org.amdatu.libraries</artifactId> <version>0.2.1-SNAPSHOT</version> </parent> @@ -10,7 +11,4 @@ <packaging>jar</packaging> <name>Amdatu Libraries - Utilities</name> <description>This component holds several utility classes which should be embedded by bundles using it</description> - <build> - <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName> - </build> </project> Modified: trunk/amdatu-libraries/warsupport/pom.xml ============================================================================== --- trunk/amdatu-libraries/warsupport/pom.xml (original) +++ trunk/amdatu-libraries/warsupport/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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.libraries</groupId> @@ -28,7 +29,4 @@ <version>${org.apache.felix.main.version}</version> </dependency> </dependencies> - <build> - <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName> - </build> </project> Modified: trunk/amdatu-web/dispatcher/pom.xml ============================================================================== --- trunk/amdatu-web/dispatcher/pom.xml (original) +++ trunk/amdatu-web/dispatcher/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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.web</groupId> @@ -10,6 +11,7 @@ <packaging>bundle</packaging> <name>Amdatu Web - Dispatcher</name> <description>Provides a Dispatcher implementation</description> + <dependencies> <dependency> <groupId>org.amdatu.core</groupId> @@ -31,6 +33,7 @@ <scope>compile</scope> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -41,9 +44,7 @@ <Private-Package> org.amdatu.web.dispatcher.*</Private-Package> <Bundle-Activator>org.amdatu.web.dispatcher.osgi.DispatcherServiceActivator</Bundle-Activator> <Bundle-SymbolicName>org.amdatu.web.dispatcher</Bundle-SymbolicName> - <Export-Package> - org.amdatu.web.dispatcher - </Export-Package> + <Export-Package>org.amdatu.web.dispatcher</Export-Package> <Embed-Dependency>*;scope=compile;inline=org/apache/felix/http/base/internal/util/**</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> </instructions> Modified: trunk/amdatu-web/httpcontext/pom.xml ============================================================================== --- trunk/amdatu-web/httpcontext/pom.xml (original) +++ trunk/amdatu-web/httpcontext/pom.xml Thu Apr 21 09:37:09 2011 @@ -10,6 +10,7 @@ <packaging>bundle</packaging> <name>Amdatu Web - HTTP Context</name> <description>Provides a HTTPContext implementation</description> + <dependencies> <dependency> <groupId>org.apache.felix</groupId> @@ -18,6 +19,7 @@ <scope>compile</scope> </dependency> </dependencies> + <build> <plugins> <plugin> Modified: trunk/amdatu-web/jsp/pom.xml ============================================================================== --- trunk/amdatu-web/jsp/pom.xml (original) +++ trunk/amdatu-web/jsp/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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.web</groupId> @@ -23,12 +24,12 @@ <groupId>org.ops4j.pax.swissbox</groupId> <artifactId>pax-swissbox-core</artifactId> <version>${pax.swissbox.version}</version> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>jasper</artifactId> - <version>6.0.29</version> + <version>${jasper.version}</version> <scope>compile</scope> <type>jar</type> <exclusions> Modified: trunk/amdatu-web/pom.xml ============================================================================== --- trunk/amdatu-web/pom.xml (original) +++ trunk/amdatu-web/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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> @@ -48,11 +49,12 @@ <properties> <org.amdatu.core.version>0.2.0</org.amdatu.core.version> - + <javax.servlet.version>2.5</javax.servlet.version> <jsr311-api.version>1.1.1</jsr311-api.version> <jstl.version>1.1.2</jstl.version> <taglibs.version>1.1.2</taglibs.version> + <jasper.version>6.0.29</jasper.version> <org.apache.felix.http.version>2.2.0</org.apache.felix.http.version> <org.apache.wink.version>1.1.1-incubating</org.apache.wink.version> <pax.swissbox.version>1.3.0</pax.swissbox.version> Modified: trunk/amdatu-web/rest-jaxrs/pom.xml ============================================================================== --- trunk/amdatu-web/rest-jaxrs/pom.xml (original) +++ trunk/amdatu-web/rest-jaxrs/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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.web</groupId> @@ -10,14 +11,14 @@ <packaging>bundle</packaging> <name>Amdatu Web - JAX RS</name> <description>Embeds the JAX RS libraries for REST support</description> - + <dependencies> <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> <version>${jsr311-api.version}</version> <scope>compile</scope> - </dependency> + </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> @@ -25,7 +26,7 @@ <scope>compile</scope> </dependency> </dependencies> - + <build> <plugins> <plugin> @@ -39,13 +40,12 @@ <_exportcontents> javax.ws.rs.*;version=${jsr311-api.version}, javax.annotation.security - </_exportcontents> + </_exportcontents> <Export-Package>org.amdatu.web.rest.jaxrs</Export-Package> </instructions> </configuration> </plugin> + </plugins> + </build> - </plugins> - </build> - </project> Modified: trunk/amdatu-web/tenantresolver-hostname/pom.xml ============================================================================== --- trunk/amdatu-web/tenantresolver-hostname/pom.xml (original) +++ trunk/amdatu-web/tenantresolver-hostname/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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.web</groupId> @@ -10,22 +11,24 @@ <packaging>bundle</packaging> <name>Amdatu Web - Tenant Hostname Resolver</name> <description>Implementation of a Dispatcher ExtenderFilter that resolves a Tenant based on the request hostname</description> + <dependencies> <dependency> <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core.tenant</artifactId> + <version>${org.amdatu.core.version}</version> <scope>provided</scope> <type>bundle</type> - <version>${org.amdatu.core.version}</version> </dependency> <dependency> <groupId>org.amdatu.web</groupId> <artifactId>org.amdatu.web.dispatcher</artifactId> + <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> - <version>${project.version}</version> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -36,9 +39,7 @@ <Private-Package> org.amdatu.web.tenantresolver.hostname.*</Private-Package> <Bundle-Activator>org.amdatu.web.tenantresolver.hostname.osgi.HostnameTenantResolverActivator</Bundle-Activator> <Bundle-SymbolicName>org.amdatu.web.tenantresolver.hostname</Bundle-SymbolicName> - <Export-Package> - org.amdatu.web.tenantresolver.hostname - </Export-Package> + <Export-Package>org.amdatu.web.tenantresolver.hostname</Export-Package> </instructions> </configuration> </plugin> Modified: trunk/amdatu-web/tenantresolver-parameter/pom.xml ============================================================================== --- trunk/amdatu-web/tenantresolver-parameter/pom.xml (original) +++ trunk/amdatu-web/tenantresolver-parameter/pom.xml Thu Apr 21 09:37:09 2011 @@ -1,5 +1,6 @@ <?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.web</groupId> @@ -10,22 +11,24 @@ <packaging>bundle</packaging> <name>Amdatu Web - Tenant Parameter Resolver</name> <description>Implementation of a Dispatcher ExtenderFilter that resolves a Tenant based on the request parameter</description> + <dependencies> <dependency> <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core.tenant</artifactId> + <version>${org.amdatu.core.version}</version> <scope>provided</scope> <type>bundle</type> - <version>${org.amdatu.core.version}</version> </dependency> <dependency> <groupId>org.amdatu.web</groupId> <artifactId>org.amdatu.web.dispatcher</artifactId> + <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> - <version>${project.version}</version> </dependency> </dependencies> + <build> <plugins> <plugin> @@ -36,9 +39,7 @@ <Private-Package> org.amdatu.web.tenantresolver.parameter.*</Private-Package> <Bundle-Activator>org.amdatu.web.tenantresolver.parameter.osgi.ParameterTenantResolverActivator</Bundle-Activator> <Bundle-SymbolicName>org.amdatu.web.tenantresolver.parameter</Bundle-SymbolicName> - <Export-Package> - org.amdatu.web.tenantresolver.parameter - </Export-Package> + <Export-Package>org.amdatu.web.tenantresolver.parameter</Export-Package> </instructions> </configuration> </plugin> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
