Author: [email protected] Date: Wed Apr 20 18:29:38 2011 New Revision: 1020
Log: AMDATU-117 to new artifact naming scheme / preparing release Modified: 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/resource/pom.xml trunk/amdatu-web/rest-jaxrs/pom.xml trunk/amdatu-web/rest-wink/pom.xml trunk/amdatu-web/tenantresolver-hostname/pom.xml trunk/amdatu-web/tenantresolver-parameter/pom.xml Modified: trunk/amdatu-web/dispatcher/pom.xml ============================================================================== --- trunk/amdatu-web/dispatcher/pom.xml (original) +++ trunk/amdatu-web/dispatcher/pom.xml Wed Apr 20 18:29:38 2011 @@ -1,23 +1,23 @@ <?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.web</groupId> <artifactId>org.amdatu.web</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> + <artifactId>org.amdatu.web.dispatcher</artifactId> <packaging>bundle</packaging> <name>Amdatu Web - Dispatcher</name> <description>Provides a Dispatcher implementation</description> <dependencies> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> + <artifactId>org.amdatu.core.tenant</artifactId> <scope>provided</scope> <type>bundle</type> - <version>${project.version}</version> + <version>${org.amdatu.core.version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> Modified: trunk/amdatu-web/httpcontext/pom.xml ============================================================================== --- trunk/amdatu-web/httpcontext/pom.xml (original) +++ trunk/amdatu-web/httpcontext/pom.xml Wed Apr 20 18:29:38 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.web</groupId> <artifactId>org.amdatu.web</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <packaging>bundle</packaging> <name>Amdatu Web - HTTP Context</name> <description>Provides a HTTPContext implementation</description> Modified: trunk/amdatu-web/jsp/pom.xml ============================================================================== --- trunk/amdatu-web/jsp/pom.xml (original) +++ trunk/amdatu-web/jsp/pom.xml Wed Apr 20 18:29:38 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.web</groupId> <artifactId>org.amdatu.web</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.web</groupId> - <artifactId>jsp</artifactId> + <artifactId>org.amdatu.web.jsp</artifactId> <packaging>bundle</packaging> <name>Amdatu Web - JSP Support</name> <description>Bundle providing JSP support</description> @@ -16,7 +15,7 @@ <dependencies> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <scope>provided</scope> <version>${project.version}</version> <type>bundle</type> Modified: trunk/amdatu-web/pom.xml ============================================================================== --- trunk/amdatu-web/pom.xml (original) +++ trunk/amdatu-web/pom.xml Wed Apr 20 18:29:38 2011 @@ -5,9 +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.web</groupId> <artifactId>org.amdatu.web</artifactId> <version>0.2.0-SNAPSHOT</version> <name>Amdatu Web</name> @@ -39,7 +40,16 @@ </repository> </repositories> + <scm> + <connection>scm:svn:http://subversion.amdatu.org/svn/amdatu/trunk/amdatu-web</connection> + <developerConnection>scm:svn:http://subversion.amdatu.org/svn/amdatu/trunk/amdatu-web</developerConnection> + <url>http://subversion.amdatu.org/viewvc/amdatu/amdatu-web</url> + </scm> + <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> Modified: trunk/amdatu-web/resource/pom.xml ============================================================================== --- trunk/amdatu-web/resource/pom.xml (original) +++ trunk/amdatu-web/resource/pom.xml Wed Apr 20 18:29:38 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.web</groupId> <artifactId>org.amdatu.web</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.web</groupId> - <artifactId>resource</artifactId> + <artifactId>org.amdatu.web.resource</artifactId> <packaging>bundle</packaging> <name>Amdatu Web - Resource Support</name> <description>Bundle providing Resource support</description> @@ -15,7 +14,7 @@ <dependencies> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> Modified: trunk/amdatu-web/rest-jaxrs/pom.xml ============================================================================== --- trunk/amdatu-web/rest-jaxrs/pom.xml (original) +++ trunk/amdatu-web/rest-jaxrs/pom.xml Wed Apr 20 18:29:38 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.web</groupId> <artifactId>org.amdatu.web</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.web.rest</groupId> - <artifactId>jaxrs</artifactId> + <artifactId>org.amdatu.web.jaxrs</artifactId> <packaging>bundle</packaging> <name>Amdatu Web - JAX RS</name> <description>Embeds the JAX RS libraries for REST support</description> Modified: trunk/amdatu-web/rest-wink/pom.xml ============================================================================== --- trunk/amdatu-web/rest-wink/pom.xml (original) +++ trunk/amdatu-web/rest-wink/pom.xml Wed Apr 20 18:29:38 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.web</groupId> <artifactId>org.amdatu.web</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.web.rest</groupId> - <artifactId>wink</artifactId> + <artifactId>org.amdatu.web.wink</artifactId> <packaging>bundle</packaging> <name>Amdatu Web - Apache Wink Application</name> <description>Embeds the Apache Wink libraries and provides the necessary services to publish REST services from OSGi services</description> @@ -16,28 +15,28 @@ <dependencies> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>tenant</artifactId> - <version>${project.version}</version> + <artifactId>org.amdatu.core.tenant</artifactId> + <version>${org.amdatu.core.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> - <groupId>org.amdatu.web.rest</groupId> - <artifactId>jaxrs</artifactId> + <groupId>org.amdatu.web</groupId> + <artifactId>org.amdatu.web.jaxrs</artifactId> <version>${project.version}</version> <type>bundle</type> <scope>provided</scope> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> + <artifactId>org.amdatu.web.dispatcher</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>httpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <version>${project.version}</version> <scope>provided</scope> <type>bundle</type> Modified: trunk/amdatu-web/tenantresolver-hostname/pom.xml ============================================================================== --- trunk/amdatu-web/tenantresolver-hostname/pom.xml (original) +++ trunk/amdatu-web/tenantresolver-hostname/pom.xml Wed Apr 20 18:29:38 2011 @@ -1,48 +1,48 @@ <?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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.amdatu</groupId> - <artifactId>org.amdatu.web</artifactId> - <version>0.2.0-SNAPSHOT</version> - </parent> - <groupId>org.amdatu.web</groupId> - <artifactId>tenantresolver-hostname</artifactId> - <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>tenant</artifactId> - <scope>provided</scope> - <type>bundle</type> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> - <scope>provided</scope> - <type>bundle</type> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <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 +<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> + <artifactId>org.amdatu.web</artifactId> + <version>0.2.0-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId> + <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> + <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> + <scope>provided</scope> + <type>bundle</type> + <version>${project.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <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> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/amdatu-web/tenantresolver-parameter/pom.xml ============================================================================== --- trunk/amdatu-web/tenantresolver-parameter/pom.xml (original) +++ trunk/amdatu-web/tenantresolver-parameter/pom.xml Wed Apr 20 18:29:38 2011 @@ -1,48 +1,48 @@ <?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";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.amdatu</groupId> - <artifactId>org.amdatu.web</artifactId> - <version>0.2.0-SNAPSHOT</version> - </parent> - <groupId>org.amdatu.web</groupId> - <artifactId>tenantresolver-parameter</artifactId> - <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>tenant</artifactId> - <scope>provided</scope> - <type>bundle</type> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.amdatu.web</groupId> - <artifactId>dispatcher</artifactId> - <scope>provided</scope> - <type>bundle</type> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <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 +<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> + <artifactId>org.amdatu.web</artifactId> + <version>0.2.0-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.web.tenantresolver.parameter</artifactId> + <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> + <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> + <scope>provided</scope> + <type>bundle</type> + <version>${project.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <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> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
