Author: ivol Date: Mon Oct 11 09:48:23 2010 New Revision: 146 Log: Replaced tabs with spaces in all pom.xml's
Modified: trunk/amdatu-release/pom.xml trunk/application-bundles/dashboard-bundle/pom.xml trunk/application-bundles/gadget-management/pom.xml trunk/application-bundles/pom.xml trunk/example-bundles/course-gadget/pom.xml trunk/example-bundles/course-service/pom.xml trunk/example-bundles/friends-gadget/pom.xml trunk/example-bundles/pom.xml trunk/gadget-bundles/login-gadget/pom.xml trunk/gadget-bundles/pom.xml trunk/gadget-bundles/sparqlendpoint-gadget/pom.xml trunk/libraries/amdatu-utilities/pom.xml trunk/libraries/pom.xml trunk/platform-bundles/authorization-service/pom.xml trunk/platform-bundles/cassandra-application/pom.xml trunk/platform-bundles/cassandra-listener/pom.xml trunk/platform-bundles/cassandra-persistencemanager/pom.xml trunk/platform-bundles/config-template-manager/pom.xml trunk/platform-bundles/httpcontext/pom.xml trunk/platform-bundles/loghandler/pom.xml trunk/platform-bundles/pom.xml trunk/platform-bundles/profile-service/pom.xml trunk/platform-bundles/sesame-application/pom.xml trunk/platform-bundles/shindig-application/pom.xml trunk/platform-bundles/tenant-service/pom.xml trunk/platform-bundles/useradmin-cassandra-store/pom.xml trunk/platform-bundles/wink-application/pom.xml trunk/pom.xml trunk/test-bundles/integrationtest-bundle/pom.xml trunk/test-bundles/pom.xml Modified: trunk/amdatu-release/pom.xml ============================================================================== --- trunk/amdatu-release/pom.xml (original) +++ trunk/amdatu-release/pom.xml Mon Oct 11 09:48:23 2010 @@ -1,270 +1,270 @@ <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>amdatu</artifactId> - <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>amdatu</artifactId> + <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> + </parent> <packaging>pom</packaging> <artifactId>amdatu-release</artifactId> <name>Amdatu release</name> <dependencies> - <!-- Application bundles --> - <dependency> - <groupId>org.amdatu.application</groupId> - <artifactId>dashboard</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.application</groupId> - <artifactId>gadgetmanagement</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - </dependency> - - <!-- Example bundles --> - <dependency> - <groupId>org.amdatu.example</groupId> - <artifactId>course-gadget</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.example</groupId> - <artifactId>course-service</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.example</groupId> - <artifactId>friends-gadget</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - </dependency> - - <!-- Gadget bundles --> - <dependency> - <groupId>org.amdatu.gadget</groupId> - <artifactId>login</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.gadget</groupId> - <artifactId>sparqlendpoint</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - </dependency> - - <!-- Platform bundles --> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>authorization</artifactId> - <version>${platform.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-listener</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-persistencemanager</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>config-template-manager</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>loghandler</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>profile-service</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>sesame-application</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>shindig-application</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>tenant-service</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>useradmin-cassandra-store</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>wink-application</artifactId> - <version>${platform.version}</version> - <scope>runtime</scope> - </dependency> - - <!-- System bundles --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>${org.apache.felix.main.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${org.osgi.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${org.osgi.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.eventadmin</artifactId> - <version>${org.apache.felix.eventadmin.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> - <version>${org.apache.felix.configadmin.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>${org.apache.felix.log.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.fileinstall</artifactId> - <version>${org.apache.felix.file.install.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jetty-bundle</artifactId> - <version>${pax-web.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jsp</artifactId> - <version>${pax-web.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.mime</artifactId> - <version>${org.apache.sling.commons.mime.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.osgi</artifactId> - <version>${org.apache.sling.commons.osgi.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.dependencymanager</artifactId> - <version>${org.apache.felix.dependencymanager.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.metatype</artifactId> - <version>${org.apache.felix.metatype.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.webconsole</artifactId> - <version>${org.apache.felix.webconsole.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.shell.tui</artifactId> - <version>${org.apache.felix.shell.tui.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.shell</artifactId> - <version>${org.apache.felix.shell.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.useradmin</groupId> - <artifactId>pax-useradmin-service</artifactId> - <version>${pax.useradmin.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <executions> - <execution> - <id>create-release</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin-release.xml</descriptor> - <descriptor>src/main/assembly/src-release.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!-- Application bundles --> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>dashboard</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>gadgetmanagement</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Example bundles --> + <dependency> + <groupId>org.amdatu.example</groupId> + <artifactId>course-gadget</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.example</groupId> + <artifactId>course-service</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.example</groupId> + <artifactId>friends-gadget</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Gadget bundles --> + <dependency> + <groupId>org.amdatu.gadget</groupId> + <artifactId>login</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.gadget</groupId> + <artifactId>sparqlendpoint</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Platform bundles --> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>authorization</artifactId> + <version>${platform.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-persistencemanager</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>config-template-manager</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>loghandler</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>profile-service</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>sesame-application</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>useradmin-cassandra-store</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>wink-application</artifactId> + <version>${platform.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- System bundles --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>${org.apache.felix.main.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${org.osgi.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${org.osgi.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.eventadmin</artifactId> + <version>${org.apache.felix.eventadmin.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <version>${org.apache.felix.configadmin.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${org.apache.felix.log.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.fileinstall</artifactId> + <version>${org.apache.felix.file.install.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-jetty-bundle</artifactId> + <version>${pax-web.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-jsp</artifactId> + <version>${pax-web.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.mime</artifactId> + <version>${org.apache.sling.commons.mime.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.osgi</artifactId> + <version>${org.apache.sling.commons.osgi.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.dependencymanager</artifactId> + <version>${org.apache.felix.dependencymanager.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.metatype</artifactId> + <version>${org.apache.felix.metatype.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <version>${org.apache.felix.webconsole.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.shell.tui</artifactId> + <version>${org.apache.felix.shell.tui.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.shell</artifactId> + <version>${org.apache.felix.shell.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.useradmin</groupId> + <artifactId>pax-useradmin-service</artifactId> + <version>${pax.useradmin.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <executions> + <execution> + <id>create-release</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin-release.xml</descriptor> + <descriptor>src/main/assembly/src-release.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: trunk/application-bundles/dashboard-bundle/pom.xml ============================================================================== --- trunk/application-bundles/dashboard-bundle/pom.xml (original) +++ trunk/application-bundles/dashboard-bundle/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,50 +2,50 @@ <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.application-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.application-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.application</groupId> <artifactId>dashboard</artifactId> <packaging>bundle</packaging> <name>Amdatu Application - Dashboard</name> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>authorization</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>authorization</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.application.dashboard.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName> org.amdatu.application.dashboard</Bundle-SymbolicName> - </instructions> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.application.dashboard.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName> org.amdatu.application.dashboard</Bundle-SymbolicName> + </instructions> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> </build> </project> Modified: trunk/application-bundles/gadget-management/pom.xml ============================================================================== --- trunk/application-bundles/gadget-management/pom.xml (original) +++ trunk/application-bundles/gadget-management/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,83 +2,83 @@ <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.application-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.application-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.application</groupId> <artifactId>gadgetmanagement</artifactId> <packaging>bundle</packaging> <name>Amdatu Application - Gadget Management</name> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>authorization</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-persistencemanager</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-listener</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>wink-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>shindig-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.libraries</groupId> - <artifactId>amdatu-utilities</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>authorization</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-persistencemanager</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>wink-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.libraries</groupId> + <artifactId>amdatu-utilities</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.application.gadgetmanagement.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName> org.amdatu.application.gadgetmanagement</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - </instructions> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.application.gadgetmanagement.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName> org.amdatu.application.gadgetmanagement</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + </instructions> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> </build> </project> Modified: trunk/application-bundles/pom.xml ============================================================================== --- trunk/application-bundles/pom.xml (original) +++ trunk/application-bundles/pom.xml Mon Oct 11 09:48:23 2010 @@ -1,51 +1,51 @@ <?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> - <groupId>org.amdatu</groupId> - <artifactId>org.amdatu.application-bundles</artifactId> - <packaging>pom</packaging> - <parent> - <groupId>org.amdatu</groupId> - <artifactId>amdatu</artifactId> - <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> - </parent> - - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <modules> - <module>dashboard-bundle</module> - <module>gadget-management</module> - </modules> + <modelVersion>4.0.0</modelVersion> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.application-bundles</artifactId> + <packaging>pom</packaging> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>amdatu</artifactId> + <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> + </parent> + + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <modules> + <module>dashboard-bundle</module> + <module>gadget-management</module> + </modules> - <build> - <pluginManagement> - <plugins> - <!-- This plugin ensures that the resulting jar is also copied to the proper - target directory, bound to the package phase --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${root.directory}/application-bundles" overwrite="true" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> + <build> + <pluginManagement> + <plugins> + <!-- This plugin ensures that the resulting jar is also copied to the proper + target directory, bound to the package phase --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${root.directory}/application-bundles" overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> </project> \ No newline at end of file Modified: trunk/example-bundles/course-gadget/pom.xml ============================================================================== --- trunk/example-bundles/course-gadget/pom.xml (original) +++ trunk/example-bundles/course-gadget/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,64 +2,64 @@ <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.example-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.example-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.example</groupId> <artifactId>course-gadget</artifactId> <packaging>bundle</packaging> <name>Amdatu Example - Course gadget</name> - - <dependencies> - <dependency> - <groupId>org.amdatu.application</groupId> - <artifactId>gadgetmanagement</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>shindig-application</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + + <dependencies> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>gadgetmanagement</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.example.course.gadget.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.example.course-gadget</Bundle-SymbolicName> - </instructions> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> - - <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> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.example.course.gadget.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.example.course-gadget</Bundle-SymbolicName> + </instructions> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + + <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> + </build> </project> Modified: trunk/example-bundles/course-service/pom.xml ============================================================================== --- trunk/example-bundles/course-service/pom.xml (original) +++ trunk/example-bundles/course-service/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,124 +2,124 @@ <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.example-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.example-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.example</groupId> <artifactId>course-service</artifactId> <packaging>bundle</packaging> <name>Amdatu Example - Course service</name> - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>wink-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>shindig-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-listener</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>tenant-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>profile-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>sesame-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.wink</groupId> - <artifactId>wink-component-test-support</artifactId> - <version>${org.apache.wink.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>config-template-manager</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>authorization</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>wink-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>profile-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>sesame-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.wink</groupId> + <artifactId>wink-component-test-support</artifactId> + <version>${org.apache.wink.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>config-template-manager</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>authorization</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <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> - - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.example.course.service.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.example.course-service</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - <Import-Package> - *;resolution:=optional - </Import-Package> - <Export-Package>org.amdatu.example.course.service</Export-Package> - </instructions> - </configuration> - </plugin> + <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> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.example.course.service.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.example.course-service</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package> + *;resolution:=optional + </Import-Package> + <Export-Package>org.amdatu.example.course.service</Export-Package> + </instructions> + </configuration> + </plugin> - <!-- FIXME: can we move this in some way to the parent pom and use inheritence? --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> + <!-- FIXME: can we move this in some way to the parent pom and use inheritence? --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> </build> </project> Modified: trunk/example-bundles/friends-gadget/pom.xml ============================================================================== --- trunk/example-bundles/friends-gadget/pom.xml (original) +++ trunk/example-bundles/friends-gadget/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,63 +2,63 @@ <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.example-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.example-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.example</groupId> <artifactId>friends-gadget</artifactId> <packaging>bundle</packaging> <name>Amdatu Example - Friends gadget</name> - - <dependencies> - <dependency> - <groupId>org.amdatu.application</groupId> - <artifactId>gadgetmanagement</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>shindig-application</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + + <dependencies> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>gadgetmanagement</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.example.friends.gadget.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.example.friends-gadget</Bundle-SymbolicName> - </instructions> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> - - <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> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.example.friends.gadget.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.example.friends-gadget</Bundle-SymbolicName> + </instructions> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + + <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> </build> </project> Modified: trunk/example-bundles/pom.xml ============================================================================== --- trunk/example-bundles/pom.xml (original) +++ trunk/example-bundles/pom.xml Mon Oct 11 09:48:23 2010 @@ -1,52 +1,52 @@ <?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> - <groupId>org.amdatu</groupId> - <artifactId>org.amdatu.example-bundles</artifactId> - <packaging>pom</packaging> - <parent> - <groupId>org.amdatu</groupId> - <artifactId>amdatu</artifactId> - <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> - </parent> - - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <modelVersion>4.0.0</modelVersion> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.example-bundles</artifactId> + <packaging>pom</packaging> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>amdatu</artifactId> + <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> + </parent> + + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <modules> - <module>course-gadget</module> - <module>course-service</module> - <module>friends-gadget</module> - </modules> - - <build> - <pluginManagement> - <plugins> - <!-- This plugin ensures that the resulting jar is also copied to the proper - target directory, bound to the package phase --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${root.directory}/example-bundles" overwrite="true" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> + <modules> + <module>course-gadget</module> + <module>course-service</module> + <module>friends-gadget</module> + </modules> + + <build> + <pluginManagement> + <plugins> + <!-- This plugin ensures that the resulting jar is also copied to the proper + target directory, bound to the package phase --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${root.directory}/example-bundles" overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> </project> \ No newline at end of file Modified: trunk/gadget-bundles/login-gadget/pom.xml ============================================================================== --- trunk/gadget-bundles/login-gadget/pom.xml (original) +++ trunk/gadget-bundles/login-gadget/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,76 +2,76 @@ <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.gadget-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.gadget-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.gadget</groupId> <artifactId>login</artifactId> <packaging>bundle</packaging> <name>Amdatu Gadget - Login</name> - - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>authorization</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.application</groupId> - <artifactId>gadgetmanagement</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <scope>compile</scope> - </dependency> - </dependencies> - + + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>authorization</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>gadgetmanagement</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.gadget.login.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.gadget.login</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - </instructions> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> - - <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> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.gadget.login.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.gadget.login</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + </instructions> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + + <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> </build> </project> Modified: trunk/gadget-bundles/pom.xml ============================================================================== --- trunk/gadget-bundles/pom.xml (original) +++ trunk/gadget-bundles/pom.xml Mon Oct 11 09:48:23 2010 @@ -1,56 +1,56 @@ <?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> - <groupId>org.amdatu</groupId> - <artifactId>org.amdatu.gadget-bundles</artifactId> - <packaging>pom</packaging> - <parent> - <groupId>org.amdatu</groupId> - <artifactId>amdatu</artifactId> - <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> - </parent> - - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>shindig-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <modules> - <module>login-gadget</module> - <module>sparqlendpoint-gadget</module> - </modules> - - <build> - <pluginManagement> - <plugins> - <!-- This plugin ensures that the resulting jar is also copied to the proper - target directory, bound to the package phase --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${root.directory}/gadget-bundles" overwrite="true" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> + <modelVersion>4.0.0</modelVersion> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.gadget-bundles</artifactId> + <packaging>pom</packaging> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>amdatu</artifactId> + <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> + </parent> + + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <modules> + <module>login-gadget</module> + <module>sparqlendpoint-gadget</module> + </modules> + + <build> + <pluginManagement> + <plugins> + <!-- This plugin ensures that the resulting jar is also copied to the proper + target directory, bound to the package phase --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${root.directory}/gadget-bundles" overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> </project> \ No newline at end of file Modified: trunk/gadget-bundles/sparqlendpoint-gadget/pom.xml ============================================================================== --- trunk/gadget-bundles/sparqlendpoint-gadget/pom.xml (original) +++ trunk/gadget-bundles/sparqlendpoint-gadget/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,79 +2,79 @@ <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.gadget-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.gadget-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.gadget</groupId> <artifactId>sparqlendpoint</artifactId> <packaging>bundle</packaging> <name>Amdatu Gadget - SPARQL Endpoint</name> - - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>sesame-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>wink-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.application</groupId> - <artifactId>gadgetmanagement</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>sesame-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>wink-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>gadgetmanagement</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.gadget.sparqlendpoint.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.gadget.sparqlendpoint</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - <Import-Package> - *;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> - - <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> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.gadget.sparqlendpoint.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.gadget.sparqlendpoint</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package> + *;resolution:=optional + </Import-Package> + </instructions> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + + <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> </build> </project> Modified: trunk/libraries/amdatu-utilities/pom.xml ============================================================================== --- trunk/libraries/amdatu-utilities/pom.xml (original) +++ trunk/libraries/amdatu-utilities/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,17 +2,17 @@ <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.libraries</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.libraries</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.libraries</groupId> <artifactId>amdatu-utilities</artifactId> <packaging>jar</packaging> <name>Amdatu Libraries - Utilities</name> - + <build> - <finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName> + <finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName> </build> </project> Modified: trunk/libraries/pom.xml ============================================================================== --- trunk/libraries/pom.xml (original) +++ trunk/libraries/pom.xml Mon Oct 11 09:48:23 2010 @@ -1,18 +1,18 @@ <?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> - <groupId>org.amdatu</groupId> - <artifactId>org.amdatu.libraries</artifactId> - <packaging>pom</packaging> - <parent> - <groupId>org.amdatu</groupId> - <artifactId>amdatu</artifactId> - <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> - </parent> - - <modules> - <module>amdatu-utilities</module> - </modules> - + <modelVersion>4.0.0</modelVersion> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.libraries</artifactId> + <packaging>pom</packaging> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>amdatu</artifactId> + <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> + </parent> + + <modules> + <module>amdatu-utilities</module> + </modules> + </project> \ No newline at end of file Modified: trunk/platform-bundles/authorization-service/pom.xml ============================================================================== --- trunk/platform-bundles/authorization-service/pom.xml (original) +++ trunk/platform-bundles/authorization-service/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,74 +2,74 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>authorization</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Authorization Service</name> - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>com.springsource.org.apache.commons.logging</artifactId> - <version>1.1.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>tenant-service</artifactId> - <version>0.0.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>config-template-manager</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>wink-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <scope>compile</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>com.springsource.org.apache.commons.logging</artifactId> + <version>1.1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <version>0.0.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>config-template-manager</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>wink-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.authorization.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.authorization</Bundle-SymbolicName> - <Export-Package>org.amdatu.platform.authorization</Export-Package> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.authorization.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.authorization</Bundle-SymbolicName> + <Export-Package>org.amdatu.platform.authorization</Export-Package> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> - + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> + </build> </project> Modified: trunk/platform-bundles/cassandra-application/pom.xml ============================================================================== --- trunk/platform-bundles/cassandra-application/pom.xml (original) +++ trunk/platform-bundles/cassandra-application/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,95 +2,95 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>cassandra-application</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Apache Cassandra Application</name> - <properties> - <cassandra.lib.filename>cassandra-${cassandra.version}</cassandra.lib.filename> + <properties> + <cassandra.lib.filename>cassandra-${cassandra.version}</cassandra.lib.filename> </properties> - <dependencies> - <dependency> - <groupId>org.apache.cassandra</groupId> - <artifactId>cassandra</artifactId> - <version>0.6.1</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.15</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.thrift</groupId> - <artifactId>libthrift</artifactId> - <version>917130</version> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>config-template-manager</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>cassandra</artifactId> + <version>0.6.1</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.15</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <version>917130</version> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>config-template-manager</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.cassandra.application.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.cassandra-application</Bundle-SymbolicName> - <Include-Resource> - {maven-resources}, - lib=src/main/resources/lib - </Include-Resource> - <Bundle-ClassPath> - ., - lib/antlr-3.1.3.jar, - lib/apache-cassandra-0.6.4.jar, - lib/avro-1.2.0-dev.jar, - lib/clhm-production.jar, - lib/commons-cli-1.1.jar, - lib/commons-codec-1.2.jar, - lib/commons-collections-3.2.1.jar, - lib/commons-lang-2.4.jar, - lib/google-collections-1.0.jar, - lib/hadoop-core-0.20.1.jar, - lib/high-scale-lib.jar, - lib/ivy-2.1.0.jar, - lib/jackson-core-asl-1.4.0.jar, - lib/jackson-mapper-asl-1.4.0.jar, - lib/jline-0.9.94.jar, - lib/json-simple-1.1.jar, - lib/libthrift-r917130.jar, - lib/log4j-1.2.15.jar, - lib/slf4j-api-1.5.8.jar, - lib/slf4j-log4j12-1.5.8.jar - </Bundle-ClassPath> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.cassandra.application.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.cassandra-application</Bundle-SymbolicName> + <Include-Resource> + {maven-resources}, + lib=src/main/resources/lib + </Include-Resource> + <Bundle-ClassPath> + ., + lib/antlr-3.1.3.jar, + lib/apache-cassandra-0.6.4.jar, + lib/avro-1.2.0-dev.jar, + lib/clhm-production.jar, + lib/commons-cli-1.1.jar, + lib/commons-codec-1.2.jar, + lib/commons-collections-3.2.1.jar, + lib/commons-lang-2.4.jar, + lib/google-collections-1.0.jar, + lib/hadoop-core-0.20.1.jar, + lib/high-scale-lib.jar, + lib/ivy-2.1.0.jar, + lib/jackson-core-asl-1.4.0.jar, + lib/jackson-mapper-asl-1.4.0.jar, + lib/jline-0.9.94.jar, + lib/json-simple-1.1.jar, + lib/libthrift-r917130.jar, + lib/log4j-1.2.15.jar, + lib/slf4j-api-1.5.8.jar, + lib/slf4j-log4j12-1.5.8.jar + </Bundle-ClassPath> <DynamicImport-Package> com.jcraft.jsch, com.sun.jdmk.comm, @@ -125,20 +125,20 @@ org.joda.time, org.kosmix.kosmosfs.access, </DynamicImport-Package> - <_exportcontents> - org.apache.cassandra.*, - org.apache.thrift.*, - org.amdatu.platform.cassandra.application.* - </_exportcontents> - </instructions> - </configuration> - </plugin> + <_exportcontents> + org.apache.cassandra.*, + org.apache.thrift.*, + org.amdatu.platform.cassandra.application.* + </_exportcontents> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> - + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> + </build> </project> Modified: trunk/platform-bundles/cassandra-listener/pom.xml ============================================================================== --- trunk/platform-bundles/cassandra-listener/pom.xml (original) +++ trunk/platform-bundles/cassandra-listener/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,48 +2,48 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>cassandra-listener</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Apache Cassandra Listener</name> - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-persistencemanager</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-persistencemanager</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.cassandra.listener.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.cassandra-listener</Bundle-SymbolicName> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.cassandra.listener.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.cassandra-listener</Bundle-SymbolicName> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> - </plugins> - + </plugins> + </build> </project> Modified: trunk/platform-bundles/cassandra-persistencemanager/pom.xml ============================================================================== --- trunk/platform-bundles/cassandra-persistencemanager/pom.xml (original) +++ trunk/platform-bundles/cassandra-persistencemanager/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,43 +2,43 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>cassandra-persistencemanager</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Apache Cassandra Persistence Manager</name> - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.cassandra.persistencemanager.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.cassandra.persistencemanager</Bundle-SymbolicName> - <Export-Package>org.amdatu.platform.cassandra.persistencemanager</Export-Package> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.cassandra.persistencemanager.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.cassandra.persistencemanager</Bundle-SymbolicName> + <Export-Package>org.amdatu.platform.cassandra.persistencemanager</Export-Package> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> </build> </project> Modified: trunk/platform-bundles/config-template-manager/pom.xml ============================================================================== --- trunk/platform-bundles/config-template-manager/pom.xml (original) +++ trunk/platform-bundles/config-template-manager/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,63 +2,63 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>config-template-manager</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Configuration Template Manager</name> - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> - <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> - - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.configtemplatemanager.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.configtemplatemanager</Bundle-SymbolicName> - <Export-Package> - org.amdatu.platform.configtemplatemanager - </Export-Package> - </instructions> - </configuration> - </plugin> + <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> + + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.configtemplatemanager.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.configtemplatemanager</Bundle-SymbolicName> + <Export-Package> + org.amdatu.platform.configtemplatemanager + </Export-Package> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> - + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> + </build> </project> Modified: trunk/platform-bundles/httpcontext/pom.xml ============================================================================== --- trunk/platform-bundles/httpcontext/pom.xml (original) +++ trunk/platform-bundles/httpcontext/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,84 +2,84 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>httpcontext</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - HTTP Context Service</name> - <dependencies> - <!-- Include JSTL taglibrary in this bundle so that it is embedded in this shared http context --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>com.springsource.org.apache.commons.logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>net.kornr.osgi</groupId> - <artifactId>commons-logging-osgi</artifactId> - <version>${net.kornr.osgi.commons-logging-osgi.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> + <dependencies> + <!-- Include JSTL taglibrary in this bundle so that it is embedded in this shared http context --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.1.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>com.springsource.org.apache.commons.logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>net.kornr.osgi</groupId> + <artifactId>commons-logging-osgi</artifactId> + <version>${net.kornr.osgi.commons-logging-osgi.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.httpcontext.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.httpcontext</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile;groupId=!org.apache.felix|org.osgi</Embed-Dependency> - <Import-Package> - *;resolution:=optional, - org.apache.shindig.auth, - org.apache.shindig.common, - org.apache.shindig.common.crypto, - org.apache.shindig.common.util, - org.apache.shindig.social.opensocial.oauth, - net.oauth, - org.osgi.service.useradmin, - org.amdatu.platform.httpcontext - </Import-Package> - <_exportcontents> - org.amdatu.platform.httpcontext - </_exportcontents> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.httpcontext.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.httpcontext</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile;groupId=!org.apache.felix|org.osgi</Embed-Dependency> + <Import-Package> + *;resolution:=optional, + org.apache.shindig.auth, + org.apache.shindig.common, + org.apache.shindig.common.crypto, + org.apache.shindig.common.util, + org.apache.shindig.social.opensocial.oauth, + net.oauth, + org.osgi.service.useradmin, + org.amdatu.platform.httpcontext + </Import-Package> + <_exportcontents> + org.amdatu.platform.httpcontext + </_exportcontents> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> - + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> + </build> </project> Modified: trunk/platform-bundles/loghandler/pom.xml ============================================================================== --- trunk/platform-bundles/loghandler/pom.xml (original) +++ trunk/platform-bundles/loghandler/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,52 +2,52 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>loghandler</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Log Handler</name> - <dependencies> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.loghandler.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.loghandler</Bundle-SymbolicName> - <Export-Package>org.amdatu.platform.loghandler</Export-Package> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - <DynamicImport-Package> - org.apache.log, - org.apache.log4j, - org.apache.avalon.framework.logger - </DynamicImport-Package> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.loghandler.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.loghandler</Bundle-SymbolicName> + <Export-Package>org.amdatu.platform.loghandler</Export-Package> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <DynamicImport-Package> + org.apache.log, + org.apache.log4j, + org.apache.avalon.framework.logger + </DynamicImport-Package> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> - </plugins> - + </plugins> + </build> </project> Modified: trunk/platform-bundles/pom.xml ============================================================================== --- trunk/platform-bundles/pom.xml (original) +++ trunk/platform-bundles/pom.xml Mon Oct 11 09:48:23 2010 @@ -1,55 +1,55 @@ <?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> - <groupId>org.amdatu</groupId> - <artifactId>org.amdatu.platform-bundles</artifactId> - <packaging>pom</packaging> - <parent> - <groupId>org.amdatu</groupId> - <artifactId>amdatu</artifactId> - <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> - </parent> - - <modules> - <module>authorization-service</module> - <module>cassandra-application</module> - <module>cassandra-listener</module> - <module>cassandra-persistencemanager</module> - <module>config-template-manager</module> - <module>httpcontext</module> - <module>loghandler</module> - <module>shindig-application</module> - <module>profile-service</module> - <module>sesame-application</module> - <module>tenant-service</module> - <module>useradmin-cassandra-store</module> - <module>wink-application</module> + <modelVersion>4.0.0</modelVersion> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <packaging>pom</packaging> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>amdatu</artifactId> + <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> + </parent> + + <modules> + <module>authorization-service</module> + <module>cassandra-application</module> + <module>cassandra-listener</module> + <module>cassandra-persistencemanager</module> + <module>config-template-manager</module> + <module>httpcontext</module> + <module>loghandler</module> + <module>shindig-application</module> + <module>profile-service</module> + <module>sesame-application</module> + <module>tenant-service</module> + <module>useradmin-cassandra-store</module> + <module>wink-application</module> <module>filebased-configuration</module> </modules> - - <build> - <pluginManagement> - <plugins> - <!-- This plugin ensures that the resulting jar is also copied to the proper - target directory, bound to the package phase --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${root.directory}/platform-bundles" overwrite="true" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> + + <build> + <pluginManagement> + <plugins> + <!-- This plugin ensures that the resulting jar is also copied to the proper + target directory, bound to the package phase --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${root.directory}/platform-bundles" overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> </project> \ No newline at end of file Modified: trunk/platform-bundles/profile-service/pom.xml ============================================================================== --- trunk/platform-bundles/profile-service/pom.xml (original) +++ trunk/platform-bundles/profile-service/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,71 +2,71 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>profile-service</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Profile Service</name> - <dependencies> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>1.4</version> - <scope>compile</scope> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>1.4</version> + <scope>compile</scope> </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>shindig-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-listener</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>tenant-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>authorization</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>authorization</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.profile.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.profile-service</Bundle-SymbolicName> - <Export-Package>org.amdatu.platform.profile</Export-Package> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.profile.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.profile-service</Bundle-SymbolicName> + <Export-Package>org.amdatu.platform.profile</Export-Package> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> </build> </project> Modified: trunk/platform-bundles/sesame-application/pom.xml ============================================================================== --- trunk/platform-bundles/sesame-application/pom.xml (original) +++ trunk/platform-bundles/sesame-application/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,63 +2,63 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>sesame-application</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Sesame Application</name> - <dependencies> - <dependency> - <groupId>org.openrdf.sesame</groupId> - <artifactId>sesame-runtime-osgi</artifactId> - <version>${org.openrdf.sesame.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>1.5.11</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.sesame.application.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.sesame-application</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - <Import-Package> - *;resolution:=optional - </Import-Package> - <_exportcontents> - org.amdatu.platform.sesame.application, - org.openrdf.* - </_exportcontents> - </instructions> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> + <dependencies> + <dependency> + <groupId>org.openrdf.sesame</groupId> + <artifactId>sesame-runtime-osgi</artifactId> + <version>${org.openrdf.sesame.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>1.5.11</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.sesame.application.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.sesame-application</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package> + *;resolution:=optional + </Import-Package> + <_exportcontents> + org.amdatu.platform.sesame.application, + org.openrdf.* + </_exportcontents> + </instructions> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> </build> </project> Modified: trunk/platform-bundles/shindig-application/pom.xml ============================================================================== --- trunk/platform-bundles/shindig-application/pom.xml (original) +++ trunk/platform-bundles/shindig-application/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,168 +2,168 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>shindig-application</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Apache Shindig Application</name> - <dependencies> - - <!-- Shindig Dependencies --> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-common</artifactId> - <version>${shindig.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> - <version>${shindig.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-social-api</artifactId> - <version>${shindig.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-features</artifactId> - <version>${shindig.version}</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> + <dependencies> + + <!-- Shindig Dependencies --> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-common</artifactId> + <version>${shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + <version>${shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + <version>${shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-features</artifactId> + <version>${shindig.version}</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.ops4j</groupId> <artifactId>peaberry</artifactId> <version>1.1.1</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.libraries</groupId> - <artifactId>amdatu-utilities</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-persistencemanager</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-listener</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.libraries</groupId> + <artifactId>amdatu-utilities</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-persistencemanager</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - <include>**/*.json</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - <exclude>**/*.json</exclude> - </excludes> - </resource> - </resources> - - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.shindig.application.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.shindig-application</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile;artifactId=amdatu-utilities</Embed-Dependency> - <Include-Resource> - {maven-resources}, - lib=src/main/resources/lib - </Include-Resource> - <Bundle-ClassPath> - ., - lib/aopalliance-1.0.jar, - lib/caja-r3828.jar, - lib/commons-beanutils-1.7.0.jar, - lib/commons-beanutils-core-1.7.0.jar, - lib/commons-betwixt-0.8.jar, - lib/commons-codec-1.3.jar, - lib/commons-collections-2.0.jar, - lib/commons-digester-1.7.jar, - lib/commons-fileupload-1.2.jar, - lib/commons-httpclient-3.1.jar, - lib/commons-io-1.4.jar, - lib/commons-lang-2.4.jar, - lib/com.springsource.org.apache.commons.logging-1.1.1.jar, - lib/ehcache-1.6.2.jar, - lib/geronimo-stax-api_1.0_spec-1.0.1.jar, - lib/google-collections-1.0-rc2.jar, - lib/guice-2.0.jar, - lib/htmlparser-1.0.7.jar, - lib/icu4j-3.8.jar, - lib/jdom-1.0.jar, - lib/joda-time-1.6.jar, - lib/json-20070829.jar, - lib/json-simple-1.1.jar, - lib/juel-api-2.1.2.jar, - lib/juel-impl-2.1.2.jar, - lib/nekohtml-1.9.13.jar, - lib/oauth-20090531.jar, - lib/oauth-consumer-20090531.jar, - lib/oauth-httpclient3-20090531.jar, - lib/oauth-provider-20090531.jar, - lib/peaberry-1.1.1.jar, - lib/rome-1.0.jar, - lib/sanselan-0.97-incubator.jar, - lib/shindig-common-1.1-BETA5-incubating.jar, - lib/shindig-gadgets-1.1-BETA5-incubating.jar, - lib/shindig-social-api-1.1-BETA5-incubating.jar, - lib/shindig-features-1.1-BETA5-incubating.jar, - lib/xercesImpl-2.9.1.jar, - - lib/xpp3_min-1.1.4c.jar, - lib/xstream-1.3.1.jar - </Bundle-ClassPath> - <Import-Package> - *;resolution:=optional - </Import-Package> - <_exportcontents> - org.apache.shindig.*, - org.amdatu.platform.shindig.application, - com.google.inject.internal.*, - net.oauth.* - </_exportcontents> - </instructions> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + <include>**/*.json</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + <exclude>**/*.json</exclude> + </excludes> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.shindig.application.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.shindig-application</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile;artifactId=amdatu-utilities</Embed-Dependency> + <Include-Resource> + {maven-resources}, + lib=src/main/resources/lib + </Include-Resource> + <Bundle-ClassPath> + ., + lib/aopalliance-1.0.jar, + lib/caja-r3828.jar, + lib/commons-beanutils-1.7.0.jar, + lib/commons-beanutils-core-1.7.0.jar, + lib/commons-betwixt-0.8.jar, + lib/commons-codec-1.3.jar, + lib/commons-collections-2.0.jar, + lib/commons-digester-1.7.jar, + lib/commons-fileupload-1.2.jar, + lib/commons-httpclient-3.1.jar, + lib/commons-io-1.4.jar, + lib/commons-lang-2.4.jar, + lib/com.springsource.org.apache.commons.logging-1.1.1.jar, + lib/ehcache-1.6.2.jar, + lib/geronimo-stax-api_1.0_spec-1.0.1.jar, + lib/google-collections-1.0-rc2.jar, + lib/guice-2.0.jar, + lib/htmlparser-1.0.7.jar, + lib/icu4j-3.8.jar, + lib/jdom-1.0.jar, + lib/joda-time-1.6.jar, + lib/json-20070829.jar, + lib/json-simple-1.1.jar, + lib/juel-api-2.1.2.jar, + lib/juel-impl-2.1.2.jar, + lib/nekohtml-1.9.13.jar, + lib/oauth-20090531.jar, + lib/oauth-consumer-20090531.jar, + lib/oauth-httpclient3-20090531.jar, + lib/oauth-provider-20090531.jar, + lib/peaberry-1.1.1.jar, + lib/rome-1.0.jar, + lib/sanselan-0.97-incubator.jar, + lib/shindig-common-1.1-BETA5-incubating.jar, + lib/shindig-gadgets-1.1-BETA5-incubating.jar, + lib/shindig-social-api-1.1-BETA5-incubating.jar, + lib/shindig-features-1.1-BETA5-incubating.jar, + lib/xercesImpl-2.9.1.jar, + + lib/xpp3_min-1.1.4c.jar, + lib/xstream-1.3.1.jar + </Bundle-ClassPath> + <Import-Package> + *;resolution:=optional + </Import-Package> + <_exportcontents> + org.apache.shindig.*, + org.amdatu.platform.shindig.application, + com.google.inject.internal.*, + net.oauth.* + </_exportcontents> + </instructions> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> </build> </project> Modified: trunk/platform-bundles/tenant-service/pom.xml ============================================================================== --- trunk/platform-bundles/tenant-service/pom.xml (original) +++ trunk/platform-bundles/tenant-service/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,56 +2,56 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>tenant-service</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Tenant Service</name> - - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-persistencemanager</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-listener</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-persistencemanager</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.tenant.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.tenant-service</Bundle-SymbolicName> - <Export-Package> - org.amdatu.platform.tenant - </Export-Package> - </instructions> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> - + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.tenant.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.tenant-service</Bundle-SymbolicName> + <Export-Package> + org.amdatu.platform.tenant + </Export-Package> + </instructions> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> + </build> </project> Modified: trunk/platform-bundles/useradmin-cassandra-store/pom.xml ============================================================================== --- trunk/platform-bundles/useradmin-cassandra-store/pom.xml (original) +++ trunk/platform-bundles/useradmin-cassandra-store/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,88 +2,88 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>useradmin-cassandra-store</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - User Admin Cassandra Store</name> - <dependencies> - <dependency> - <groupId>org.ops4j.pax.useradmin</groupId> - <artifactId>pax-useradmin-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-listener</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-persistencemanager</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>tenant-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>1.4</version> - <scope>compile</scope> + <dependencies> + <dependency> + <groupId>org.ops4j.pax.useradmin</groupId> + <artifactId>pax-useradmin-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-persistencemanager</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>1.4</version> + <scope>compile</scope> </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>wink-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20090211</version> - <scope>compile</scope> - </dependency> - </dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>wink-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20090211</version> + <scope>compile</scope> + </dependency> + </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.useradmin.store.cassandra.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.useradmin.store.cassandra</Bundle-SymbolicName> - <Export-Package>org.amdatu.platform.useradmin.store.cassandra</Export-Package> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.useradmin.store.cassandra.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.useradmin.store.cassandra</Bundle-SymbolicName> + <Export-Package>org.amdatu.platform.useradmin.store.cassandra</Export-Package> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - <plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + <plugin> <artifactId>maven-javadoc-plugin</artifactId> <executions> <execution> @@ -95,8 +95,8 @@ </execution> </executions> </plugin> - - </plugins> - + + </plugins> + </build> </project> Modified: trunk/platform-bundles/wink-application/pom.xml ============================================================================== --- trunk/platform-bundles/wink-application/pom.xml (original) +++ trunk/platform-bundles/wink-application/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,78 +2,78 @@ <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.platform-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.platform-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.platform</groupId> <artifactId>wink-application</artifactId> <packaging>bundle</packaging> <name>Amdatu Platform - Apache Wink Application</name> - <dependencies> - <dependency> - <groupId>org.apache.wink</groupId> - <artifactId>wink-assembly-aggregatejar-osgi</artifactId> - <version>${org.apache.wink.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>1.5.11</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>${jsr311-api.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.wink</groupId> - <artifactId>wink-json-provider</artifactId> - <version>${org.apache.wink.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - + <dependencies> + <dependency> + <groupId>org.apache.wink</groupId> + <artifactId>wink-assembly-aggregatejar-osgi</artifactId> + <version>${org.apache.wink.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>1.5.11</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>${jsr311-api.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.wink</groupId> + <artifactId>wink-json-provider</artifactId> + <version>${org.apache.wink.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.platform.wink.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName>org.amdatu.platform.wink-application</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - <Import-Package> - *;resolution:=optional - </Import-Package> - <_exportcontents> - javax.ws.rs.*;version=${jsr311-api.version}, - org.apache.wink.server.utils, - org.apache.wink.common.model.app;version=1.1, - org.apache.wink.common.model.synd;version=1.1 - </_exportcontents> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.platform.wink.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.platform.wink-application</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package> + *;resolution:=optional + </Import-Package> + <_exportcontents> + javax.ws.rs.*;version=${jsr311-api.version}, + org.apache.wink.server.utils, + org.apache.wink.common.model.app;version=1.1, + org.apache.wink.common.model.synd;version=1.1 + </_exportcontents> + </instructions> + </configuration> + </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - - </plugins> - + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + + </plugins> + </build> </project> Modified: trunk/pom.xml ============================================================================== --- trunk/pom.xml (original) +++ trunk/pom.xml Mon Oct 11 09:48:23 2010 @@ -1,566 +1,566 @@ <?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> - <groupId>org.amdatu</groupId> - <artifactId>amdatu</artifactId> - <version>0.0.4</version> - <packaging>pom</packaging> - <name>Amdatu</name> - <description>Amdatu framework</description> - <url>http://www.amdatu.org</url> - <inceptionYear>2010</inceptionYear> - - <issueManagement> - <system>JIRA</system> - <url>http://jira.amdatu.org/jira</url> + <modelVersion>4.0.0</modelVersion> + <groupId>org.amdatu</groupId> + <artifactId>amdatu</artifactId> + <version>0.0.4</version> + <packaging>pom</packaging> + <name>Amdatu</name> + <description>Amdatu framework</description> + <url>http://www.amdatu.org</url> + <inceptionYear>2010</inceptionYear> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.amdatu.org/jira</url> </issueManagement> - <licenses> - <license> - <name>GNU General Public License version 3</name> - <url>http://www.gnu.org/licenses/gpl.html</url> - <distribution>repo</distribution> - <comments>The GNU General Public License is a free, copyleft license for software and other kinds of works.</comments> - </license> - </licenses> - - <developers> - <developer> - <id>ivol</id> - <name>Ivo Ladage-van Doorn</name> - <email>ivo.ladage-vandoorn at gxsoftware.com</email> - <organization>GX Software</organization> - <organizationUrl>http://gxsoftware.com</organizationUrl> - <roles> - <role>Developer</role> - </roles> - <timezone>+1</timezone> - </developer> - </developers> - - <!-- List op prerequisites --> - <prerequisites> - <maven>2.2.1</maven> - </prerequisites> - - <!-- Global properties specific for the entire platform build --> - <properties> - <!-- Platform version --> - <platform.version>0.0.4</platform.version> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <!-- Version numbers of dependent libraries --> - <org.apache.felix.main.version>2.0.5</org.apache.felix.main.version> - <org.osgi.version>1.0.0</org.osgi.version> - <org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version> - <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version> - <org.apache.felix.file.install.version>3.0.0</org.apache.felix.file.install.version> - <pax-web.version>0.7.1</pax-web.version> - <org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version> - <org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version> - <org.apache.felix.dependencymanager.version>3.0.0-SNAPSHOT</org.apache.felix.dependencymanager.version> - <org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version> - <org.apache.felix.webconsole.version>3.1.0</org.apache.felix.webconsole.version> - <org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version> - <org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version> - <org.apache.felix.gogo.version>0.6.0</org.apache.felix.gogo.version> - <org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version> - <org.apache.wink.version>1.1.1-incubating</org.apache.wink.version> - <org.openrdf.sesame.version>2.3.1</org.openrdf.sesame.version> - <org.openrdf.elmo.version>1.5</org.openrdf.elmo.version> - <jsr311-api.version>1.1.1</jsr311-api.version> - <jstl.version>1.1.2</jstl.version> - <taglibs.version>1.1.2</taglibs.version> - <net.kornr.osgi.commons-logging-osgi.version>20081215</net.kornr.osgi.commons-logging-osgi.version> - <pax.useradmin.version>0.0.1-SNAPSHOT</pax.useradmin.version> - <junit.version>4.8.1</junit.version> - <jmock.version>2.5.1</jmock.version> - - <!-- Version numbers of platform bundles --> - <shindig.version>1.1-BETA5-incubating</shindig.version> - <cassandra.version>0.6.4</cassandra.version> - <openrdf.version>2.3.1</openrdf.version> - - </properties> - - <!-- Modules are configured in different modules (see below) --> - <modules> - <module>platform-bundles</module> - <module>application-bundles</module> - <module>gadget-bundles</module> - <module>libraries</module> - <module>example-bundles</module> - </modules> - - <repositories> - <repository> - <id>com.springsource.repository.bundles.release</id> - <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name> - <url>http://repository.springsource.com/maven/bundles/release</url> - </repository> - <repository> - <id>com.springsource.repository.bundles.external</id> - <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name> - <url>http://repository.springsource.com/maven/bundles/external</url> - </repository> - <repository> - <id>shorrockin.com</id> - <name>Shorrockin Repository</name> - <url>http://maven.shorrockin.com/</url> - </repository> - <repository> - <id>java.net.com</id> - <name>Download java.net</name> - <url>http://download.java.net/maven/2</url> - </repository> - <repository> - <id>openrdf</id> - <name>OpenRDF</name> - <url>http://repo.aduna-software.org/maven2/releases</url> - </repository> - - <repository> - <id>repo1</id> - <name>repo1</name> - <url>http://repo1.maven.org/maven2</url> - </repository> - - </repositories> - - <dependencies> - <!-- The main Felix framework --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.main</artifactId> - <version>${org.apache.felix.main.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${org.osgi.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${org.osgi.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Event admin service --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.eventadmin</artifactId> - <version>${org.apache.felix.eventadmin.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Configuration administration service --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.configadmin</artifactId> - <version>${org.apache.felix.configadmin.version}</version> - <scope>runtime</scope> - </dependency> - - <!-- Log service bundle --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <version>${org.apache.felix.log.version}</version> - <scope>runtime</scope> - </dependency> - - <!-- Use Pax Web as HTTP service implementation --> - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jetty-bundle</artifactId> - <version>${pax-web.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.web</groupId> - <artifactId>pax-web-jsp</artifactId> - <version>${pax-web.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Include Apache Sling mimetype service --> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.mime</artifactId> - <version>${org.apache.sling.commons.mime.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.commons.osgi</artifactId> - <version>${org.apache.sling.commons.osgi.version}</version> + <licenses> + <license> + <name>GNU General Public License version 3</name> + <url>http://www.gnu.org/licenses/gpl.html</url> + <distribution>repo</distribution> + <comments>The GNU General Public License is a free, copyleft license for software and other kinds of works.</comments> + </license> + </licenses> + + <developers> + <developer> + <id>ivol</id> + <name>Ivo Ladage-van Doorn</name> + <email>ivo.ladage-vandoorn at gxsoftware.com</email> + <organization>GX Software</organization> + <organizationUrl>http://gxsoftware.com</organizationUrl> + <roles> + <role>Developer</role> + </roles> + <timezone>+1</timezone> + </developer> + </developers> + + <!-- List op prerequisites --> + <prerequisites> + <maven>2.2.1</maven> + </prerequisites> + + <!-- Global properties specific for the entire platform build --> + <properties> + <!-- Platform version --> + <platform.version>0.0.4</platform.version> + + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <!-- Version numbers of dependent libraries --> + <org.apache.felix.main.version>2.0.5</org.apache.felix.main.version> + <org.osgi.version>1.0.0</org.osgi.version> + <org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version> + <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version> + <org.apache.felix.file.install.version>3.0.0</org.apache.felix.file.install.version> + <pax-web.version>0.7.1</pax-web.version> + <org.apache.sling.commons.mime.version>2.1.4</org.apache.sling.commons.mime.version> + <org.apache.sling.commons.osgi.version>2.0.6</org.apache.sling.commons.osgi.version> + <org.apache.felix.dependencymanager.version>3.0.0-SNAPSHOT</org.apache.felix.dependencymanager.version> + <org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version> + <org.apache.felix.webconsole.version>3.1.0</org.apache.felix.webconsole.version> + <org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version> + <org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version> + <org.apache.felix.gogo.version>0.6.0</org.apache.felix.gogo.version> + <org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version> + <org.apache.wink.version>1.1.1-incubating</org.apache.wink.version> + <org.openrdf.sesame.version>2.3.1</org.openrdf.sesame.version> + <org.openrdf.elmo.version>1.5</org.openrdf.elmo.version> + <jsr311-api.version>1.1.1</jsr311-api.version> + <jstl.version>1.1.2</jstl.version> + <taglibs.version>1.1.2</taglibs.version> + <net.kornr.osgi.commons-logging-osgi.version>20081215</net.kornr.osgi.commons-logging-osgi.version> + <pax.useradmin.version>0.0.1-SNAPSHOT</pax.useradmin.version> + <junit.version>4.8.1</junit.version> + <jmock.version>2.5.1</jmock.version> + + <!-- Version numbers of platform bundles --> + <shindig.version>1.1-BETA5-incubating</shindig.version> + <cassandra.version>0.6.4</cassandra.version> + <openrdf.version>2.3.1</openrdf.version> + + </properties> + + <!-- Modules are configured in different modules (see below) --> + <modules> + <module>platform-bundles</module> + <module>application-bundles</module> + <module>gadget-bundles</module> + <module>libraries</module> + <module>example-bundles</module> + </modules> + + <repositories> + <repository> + <id>com.springsource.repository.bundles.release</id> + <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name> + <url>http://repository.springsource.com/maven/bundles/release</url> + </repository> + <repository> + <id>com.springsource.repository.bundles.external</id> + <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name> + <url>http://repository.springsource.com/maven/bundles/external</url> + </repository> + <repository> + <id>shorrockin.com</id> + <name>Shorrockin Repository</name> + <url>http://maven.shorrockin.com/</url> + </repository> + <repository> + <id>java.net.com</id> + <name>Download java.net</name> + <url>http://download.java.net/maven/2</url> + </repository> + <repository> + <id>openrdf</id> + <name>OpenRDF</name> + <url>http://repo.aduna-software.org/maven2/releases</url> + </repository> + + <repository> + <id>repo1</id> + <name>repo1</name> + <url>http://repo1.maven.org/maven2</url> + </repository> + + </repositories> + + <dependencies> + <!-- The main Felix framework --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.main</artifactId> + <version>${org.apache.felix.main.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${org.osgi.version}</version> <scope>provided</scope> - </dependency> + </dependency> + + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${org.osgi.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Event admin service --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.eventadmin</artifactId> + <version>${org.apache.felix.eventadmin.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Configuration administration service --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.configadmin</artifactId> + <version>${org.apache.felix.configadmin.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- Log service bundle --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.log</artifactId> + <version>${org.apache.felix.log.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- Use Pax Web as HTTP service implementation --> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-jetty-bundle</artifactId> + <version>${pax-web.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-jsp</artifactId> + <version>${pax-web.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Include Apache Sling mimetype service --> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.mime</artifactId> + <version>${org.apache.sling.commons.mime.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.commons.osgi</artifactId> + <version>${org.apache.sling.commons.osgi.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Dependency manager --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.dependencymanager</artifactId> + <version>${org.apache.felix.dependencymanager.version}</version> + <scope>provided</scope> + </dependency> + + <!-- The metatype service --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.metatype</artifactId> + <version>${org.apache.felix.metatype.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- Web Console --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <version>${org.apache.felix.webconsole.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- Enable this section to enable standard Felix shell --> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.shell.tui</artifactId> + <version>${org.apache.felix.shell.tui.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.shell</artifactId> + <version>${org.apache.felix.shell.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- Enable this section to enable the Gogo shell --> + <!-- + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.runtime</artifactId> + <version>${org.apache.felix.gogo.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.shell</artifactId> + <version>${org.apache.felix.gogo.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.gogo.command</artifactId> + <version>${org.apache.felix.gogo.version}</version> + <scope>runtime</scope> + </dependency> + --> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + <version>${jmock.version}</version> + </dependency> + + <!-- UserAdmin implementation --> + <dependency> + <groupId>org.ops4j.pax.useradmin</groupId> + <artifactId>pax-useradmin-service</artifactId> + <version>${pax.useradmin.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + + <!-- Here we manage the dependencies of all child projects --> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>${jstl.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>${taglibs.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Platform bundles (start level 5) --> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>authorization</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-listener</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-persistencemanager</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.libraries</groupId> + <artifactId>amdatu-utilities</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.application</groupId> + <artifactId>gadgetmanagement</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>config-template-manager</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>profile-service</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>sesame-application</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>shindig-application</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>wink-application</artifactId> + <version>${platform.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.wink</groupId> + <artifactId>wink-server</artifactId> + <version>${org.apache.wink.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.wink</groupId> + <artifactId>wink-common</artifactId> + <version>${org.apache.wink.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>${jsr311-api.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.ops4j.pax.useradmin</groupId> + <artifactId>pax-useradmin-service</artifactId> + <version>${pax.useradmin.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + <version>${jmock.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <!-- Build section, handles project's directory structure and plugins --> + <build> + <finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName> + + <plugins> + <!-- Specify the exact maven plugin version here, since some versions have issues with + resource filtering in versions 2.7 and 2.8 (see + http://stackoverflow.com/questions/1397903/setting-project-for-eclipse-using-maven) --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.6</version> + </plugin> + + <!-- Since the Felix dependency manager 3.0.0 is not yet available in + online maven repositories, it must be installed to the local maven + repository. We use the maven-install-plugin to do so during build --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <id>install-felix-dependency-manager</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${basedir}/src/main/resources/lib/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar</file> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.dependencymanager</artifactId> + <version>${org.apache.felix.dependencymanager.version}</version> + <packaging>jar</packaging> + </configuration> + </execution> + + <execution> + <id>install-commons-logging-osgi-adapter</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${basedir}/src/main/resources/lib/commons-logging-osgi-20081215.jar</file> + <groupId>net.kornr.osgi</groupId> + <artifactId>commons-logging-osgi</artifactId> + <version>${net.kornr.osgi.commons-logging-osgi.version}</version> + <packaging>jar</packaging> + </configuration> + </execution> + + <execution> + <id>install-felix-dependency-manager-shell</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${basedir}/src/main/resources/lib/org.apache.felix.dependencymanager.shell-3.0.0-SNAPSHOT.jar</file> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.dependencymanager.shell</artifactId> + <version>${org.apache.felix.dependencymanager.version}</version> + <packaging>jar</packaging> + </configuration> + </execution> + + <execution> + <id>install-pax-dependency-manager</id> + <phase>initialize</phase> + <goals> + <goal>install-file</goal> + </goals> + <configuration> + <file>${basedir}/src/main/resources/lib/pax-useradmin-service-0.0.1-SNAPSHOT.jar</file> + <groupId>org.ops4j.pax.useradmin</groupId> + <artifactId>pax-useradmin-service</artifactId> + <version>${pax.useradmin.version}</version> + <packaging>jar</packaging> + </configuration> + </execution> + </executions> + </plugin> - <!-- Dependency manager --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.dependencymanager</artifactId> - <version>${org.apache.felix.dependencymanager.version}</version> - <scope>provided</scope> - </dependency> - - <!-- The metatype service --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.metatype</artifactId> - <version>${org.apache.felix.metatype.version}</version> - <scope>runtime</scope> - </dependency> - - <!-- Web Console --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.webconsole</artifactId> - <version>${org.apache.felix.webconsole.version}</version> - <scope>runtime</scope> - </dependency> - - <!-- Enable this section to enable standard Felix shell --> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.shell.tui</artifactId> - <version>${org.apache.felix.shell.tui.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.shell</artifactId> - <version>${org.apache.felix.shell.version}</version> - <scope>runtime</scope> - </dependency> - - <!-- Enable this section to enable the Gogo shell --> - <!-- - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.gogo.runtime</artifactId> - <version>${org.apache.felix.gogo.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.gogo.shell</artifactId> - <version>${org.apache.felix.gogo.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.gogo.command</artifactId> - <version>${org.apache.felix.gogo.version}</version> - <scope>runtime</scope> - </dependency> - --> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <version>${jmock.version}</version> - </dependency> - - <!-- UserAdmin implementation --> - <dependency> - <groupId>org.ops4j.pax.useradmin</groupId> - <artifactId>pax-useradmin-service</artifactId> - <version>${pax.useradmin.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - - <!-- Here we manage the dependencies of all child projects --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>${jstl.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>${taglibs.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Platform bundles (start level 5) --> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>authorization</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-listener</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-persistencemanager</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.libraries</groupId> - <artifactId>amdatu-utilities</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.application</groupId> - <artifactId>gadgetmanagement</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>config-template-manager</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>profile-service</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>sesame-application</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>shindig-application</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>tenant-service</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>wink-application</artifactId> - <version>${platform.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.wink</groupId> - <artifactId>wink-server</artifactId> - <version>${org.apache.wink.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.wink</groupId> - <artifactId>wink-common</artifactId> - <version>${org.apache.wink.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>${jsr311-api.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.ops4j.pax.useradmin</groupId> - <artifactId>pax-useradmin-service</artifactId> - <version>${pax.useradmin.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <version>${jmock.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <!-- Build section, handles project's directory structure and plugins --> - <build> - <finalName>${project.groupId}.${project.artifactId}-${platform.version}</finalName> - - <plugins> - <!-- Specify the exact maven plugin version here, since some versions have issues with - resource filtering in versions 2.7 and 2.8 (see - http://stackoverflow.com/questions/1397903/setting-project-for-eclipse-using-maven) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.6</version> - </plugin> - - <!-- Since the Felix dependency manager 3.0.0 is not yet available in - online maven repositories, it must be installed to the local maven - repository. We use the maven-install-plugin to do so during build --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <inherited>false</inherited> - <executions> - <execution> - <id>install-felix-dependency-manager</id> - <phase>initialize</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${basedir}/src/main/resources/lib/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar</file> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.dependencymanager</artifactId> - <version>${org.apache.felix.dependencymanager.version}</version> - <packaging>jar</packaging> - </configuration> - </execution> - - <execution> - <id>install-commons-logging-osgi-adapter</id> - <phase>initialize</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${basedir}/src/main/resources/lib/commons-logging-osgi-20081215.jar</file> - <groupId>net.kornr.osgi</groupId> - <artifactId>commons-logging-osgi</artifactId> - <version>${net.kornr.osgi.commons-logging-osgi.version}</version> - <packaging>jar</packaging> - </configuration> - </execution> - - <execution> - <id>install-felix-dependency-manager-shell</id> - <phase>initialize</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${basedir}/src/main/resources/lib/org.apache.felix.dependencymanager.shell-3.0.0-SNAPSHOT.jar</file> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.dependencymanager.shell</artifactId> - <version>${org.apache.felix.dependencymanager.version}</version> - <packaging>jar</packaging> - </configuration> - </execution> - - <execution> - <id>install-pax-dependency-manager</id> - <phase>initialize</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <file>${basedir}/src/main/resources/lib/pax-useradmin-service-0.0.1-SNAPSHOT.jar</file> - <groupId>org.ops4j.pax.useradmin</groupId> - <artifactId>pax-useradmin-service</artifactId> - <version>${pax.useradmin.version}</version> - <packaging>jar</packaging> - </configuration> - </execution> - </executions> - </plugin> - - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <inherited>false</inherited> - <executions> - <!-- Copy all system bundles --> - <execution> - <id>copy-system-runtime-bundles</id> - <phase>compile</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${root.directory}/system-bundles</outputDirectory> - <excludeTransitive>true</excludeTransitive> - <includeScope>runtime</includeScope> - <includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.ops4j.pax.useradmin,org.apache.sling</includeGroupIds> - </configuration> - </execution> - <execution> - <id>copy-system-provided-bundles</id> - <phase>compile</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${root.directory}/system-bundles</outputDirectory> - <excludeTransitive>true</excludeTransitive> - <includeScope>provided</includeScope> - <includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.apache.sling</includeGroupIds> - </configuration> - </execution> - - <!-- Copy all platform bundles --> - <execution> - <id>copy-platform-bundles</id> - <phase>package</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${root.directory}/platform-bundles</outputDirectory> - <excludeTransitive>true</excludeTransitive> - <includeScope>provided</includeScope> - <includeGroupIds>org.amdatu.platform-bundles</includeGroupIds> - <excludeTypes>jar</excludeTypes> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - - <!-- Copy configuration files --> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <inherited>false</inherited> + <executions> + <!-- Copy all system bundles --> + <execution> + <id>copy-system-runtime-bundles</id> + <phase>compile</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${root.directory}/system-bundles</outputDirectory> + <excludeTransitive>true</excludeTransitive> + <includeScope>runtime</includeScope> + <includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.ops4j.pax.useradmin,org.apache.sling</includeGroupIds> + </configuration> + </execution> + <execution> + <id>copy-system-provided-bundles</id> + <phase>compile</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${root.directory}/system-bundles</outputDirectory> + <excludeTransitive>true</excludeTransitive> + <includeScope>provided</includeScope> + <includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.apache.sling</includeGroupIds> + </configuration> + </execution> + + <!-- Copy all platform bundles --> + <execution> + <id>copy-platform-bundles</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${root.directory}/platform-bundles</outputDirectory> + <excludeTransitive>true</excludeTransitive> + <includeScope>provided</includeScope> + <includeGroupIds>org.amdatu.platform-bundles</includeGroupIds> + <excludeTypes>jar</excludeTypes> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + + <!-- Copy configuration files --> <plugin> <artifactId>maven-resources-plugin</artifactId> <inherited>false</inherited> @@ -582,7 +582,7 @@ </resources> </configuration> </execution> - <execution> + <execution> <id>copy-shell</id> <phase>install</phase> <goals> @@ -598,7 +598,7 @@ </resources> </configuration> </execution> - <execution> + <execution> <id>copy-shortcuts</id> <phase>install</phase> <goals> @@ -614,7 +614,7 @@ </resources> </configuration> </execution> - <execution> + <execution> <id>copy-configs</id> <phase>install</phase> <goals> @@ -627,31 +627,31 @@ <directory>platform-bundles/cassandra-application/src/main/resources/conf</directory> <filtering>true</filtering> </resource> - <resource> + <resource> <directory>example-bundles/course-gadget/src/main/resources/conf</directory> <filtering>true</filtering> </resource> - <resource> + <resource> <directory>example-bundles/course-service/src/main/resources/conf</directory> <filtering>true</filtering> </resource> - <resource> + <resource> <directory>example-bundles/friends-gadget/src/main/resources/conf</directory> <filtering>true</filtering> </resource> - <resource> + <resource> <directory>gadget-bundles/login-gadget/src/main/resources/conf</directory> <filtering>true</filtering> </resource> - <resource> + <resource> <directory>gadget-bundles/sparqlendpoint-gadget/src/main/resources/conf</directory> <filtering>true</filtering> </resource> - <resource> + <resource> <directory>platform-bundles/loghandler/src/main/resources/conf</directory> <filtering>true</filtering> </resource> - <resource> + <resource> <directory>platform-bundles/config-template-manager/src/main/resources/conf</directory> <filtering>true</filtering> </resource> @@ -661,90 +661,90 @@ </executions> </plugin> - </plugins> - - <!-- Here we manage the plugins of all child projects --> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.1.0</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-install-plugin</artifactId> - <version>2.3.1</version> - </plugin> - </plugins> - </pluginManagement> - </build> - - <profiles> - <profile> - <!-- Profile for developers --> - <id>development</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <server.hostname>localhost</server.hostname> - <server.port>3737</server.port> - <server.port.secure>9090</server.port.secure> - <root.directory>./target</root.directory> - <conf.directory>${root.directory}/conf</conf.directory> - <work.directory.name>work</work.directory.name> - <work.directory>${root.directory}/${work.directory.name}</work.directory> - <deploy.directory.name>deploy</deploy.directory.name> - <deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <debug>true</debug> - <optimize>false</optimize> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Profile for release builds --> - <profile> - <id>release</id> - <properties> - <server.hostname>localhost</server.hostname> - <server.port>80</server.port> - <server.port.secure>443</server.port.secure> - <root.directory>./target</root.directory> - <conf.directory>${root.directory}/conf</conf.directory> - <work.directory.name>work</work.directory.name> - <work.directory>${root.directory}/${work.directory.name}</work.directory> - <deploy.directory.name>deploy</deploy.directory.name> - <deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <debug>false</debug> - <optimize>true</optimize> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> + </plugins> + + <!-- Here we manage the plugins of all child projects --> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.1.0</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>2.3.1</version> + </plugin> + </plugins> + </pluginManagement> + </build> + + <profiles> + <profile> + <!-- Profile for developers --> + <id>development</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <server.hostname>localhost</server.hostname> + <server.port>3737</server.port> + <server.port.secure>9090</server.port.secure> + <root.directory>./target</root.directory> + <conf.directory>${root.directory}/conf</conf.directory> + <work.directory.name>work</work.directory.name> + <work.directory>${root.directory}/${work.directory.name}</work.directory> + <deploy.directory.name>deploy</deploy.directory.name> + <deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <debug>true</debug> + <optimize>false</optimize> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- Profile for release builds --> + <profile> + <id>release</id> + <properties> + <server.hostname>localhost</server.hostname> + <server.port>80</server.port> + <server.port.secure>443</server.port.secure> + <root.directory>./target</root.directory> + <conf.directory>${root.directory}/conf</conf.directory> + <work.directory.name>work</work.directory.name> + <work.directory>${root.directory}/${work.directory.name}</work.directory> + <deploy.directory.name>deploy</deploy.directory.name> + <deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <debug>false</debug> + <optimize>true</optimize> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/test-bundles/integrationtest-bundle/pom.xml ============================================================================== --- trunk/test-bundles/integrationtest-bundle/pom.xml (original) +++ trunk/test-bundles/integrationtest-bundle/pom.xml Mon Oct 11 09:48:23 2010 @@ -2,69 +2,69 @@ <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.test-bundles</artifactId> - <version>0.0.4</version> - </parent> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.test-bundles</artifactId> + <version>0.0.4</version> + </parent> <groupId>org.amdatu.test</groupId> <artifactId>integration</artifactId> <packaging>bundle</packaging> <name>Amdatu Test - Integration</name> - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>cassandra-application</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>tenant-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>profile-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>tenant-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jmock</groupId> - <artifactId>jmock-junit4</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>cassandra-application</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>profile-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>tenant-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jmock</groupId> + <artifactId>jmock-junit4</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-Activator>org.amdatu.test.integration.osgi.Activator</Bundle-Activator> - <Bundle-SymbolicName> org.amdatu.test.integration</Bundle-SymbolicName> - <Embed-Dependency>*;scope=compile</Embed-Dependency> - <Embed-Transitive>true</Embed-Transitive> - </instructions> - </configuration> - </plugin> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.test.integration.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName> org.amdatu.test.integration</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + </instructions> + </configuration> + </plugin> - <!-- FIXME: can we move this in some way to the parent pom and use inheritence? --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> + <!-- FIXME: can we move this in some way to the parent pom and use inheritence? --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> </build> </project> Modified: trunk/test-bundles/pom.xml ============================================================================== --- trunk/test-bundles/pom.xml (original) +++ trunk/test-bundles/pom.xml Mon Oct 11 09:48:23 2010 @@ -1,50 +1,50 @@ <?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> - <groupId>org.amdatu</groupId> - <artifactId>org.amdatu.test-bundles</artifactId> - <packaging>pom</packaging> - <parent> - <groupId>org.amdatu</groupId> - <artifactId>amdatu</artifactId> - <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> - </parent> - - <dependencies> - <dependency> - <groupId>org.amdatu.platform</groupId> - <artifactId>httpcontext</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <modules> - <module>integrationtest-bundle</module> - </modules> + <modelVersion>4.0.0</modelVersion> + <groupId>org.amdatu</groupId> + <artifactId>org.amdatu.test-bundles</artifactId> + <packaging>pom</packaging> + <parent> + <groupId>org.amdatu</groupId> + <artifactId>amdatu</artifactId> + <version>0.0.4</version> <!-- There is not yet an easy way to inherit this version from its parent --> + </parent> + + <dependencies> + <dependency> + <groupId>org.amdatu.platform</groupId> + <artifactId>httpcontext</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <modules> + <module>integrationtest-bundle</module> + </modules> - <build> - <pluginManagement> - <plugins> - <!-- This plugin ensures that the resulting jar is also copied to the proper - target directory, bound to the package phase --> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${deploy.directory}" overwrite="true" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> + <build> + <pluginManagement> + <plugins> + <!-- This plugin ensures that the resulting jar is also copied to the proper + target directory, bound to the package phase --> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="${project.build.directory}/${project.build.finalName}.jar" todir="${deploy.directory}" overwrite="true" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> </project> \ No newline at end of file
