Repository: oodt Updated Branches: refs/heads/osgi-plugin 752bacbb8 -> b53fa99df
merge pull request Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/b53fa99d Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/b53fa99d Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/b53fa99d Branch: refs/heads/osgi-plugin Commit: b53fa99df57c89bd6a283508c46a3592aa333b0e Parents: 752bacb Author: Tom Barber <[email protected]> Authored: Sat Oct 17 21:40:36 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Sat Oct 17 21:40:36 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + catalog/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++ cli/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++ commons/pom.xml | 60 ++++++++++++++++++++++++++++++++++++++++- crawler/pom.xml | 61 +++++++++++++++++++++++++++++++++++++++++ filemgr/pom.xml | 62 ++++++++++++++++++++++++++++++++++++++++++ grid/pom.xml | 59 +++++++++++++++++++++++++++++++++++++++- metadata/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++ opendapps/pom.xml | 58 +++++++++++++++++++++++++++++++++++++++ pcs/core/pom.xml | 63 +++++++++++++++++++++++++++++++++++++++++-- pcs/input/pom.xml | 61 +++++++++++++++++++++++++++++++++++++++-- pcs/opsui/pom.xml | 35 +++++++++++++++++++++++- pcs/services/pom.xml | 45 ++++++++++++++++++++++++++++--- pge/pom.xml | 66 +++++++++++++++++++++++++++++++++++++++++++-- product/pom.xml | 59 ++++++++++++++++++++++++++++++++++++++++ profile/pom.xml | 59 ++++++++++++++++++++++++++++++++++++++++ protocol/api/pom.xml | 63 +++++++++++++++++++++++++++++++++++++++++++ protocol/ftp/pom.xml | 60 +++++++++++++++++++++++++++++++++++++++++ protocol/http/pom.xml | 59 ++++++++++++++++++++++++++++++++++++++++ protocol/imaps/pom.xml | 62 ++++++++++++++++++++++++++++++++++++++++++ protocol/sftp/pom.xml | 62 ++++++++++++++++++++++++++++++++++++++++++ pushpull/pom.xml | 36 ++++++++++++++++++++++++- resource/pom.xml | 62 ++++++++++++++++++++++++++++++++++++++++++ sso/pom.xml | 43 ++++++++++++++++++++++++++--- workflow/pom.xml | 41 +++++++++++++++++++++++++++- xmlps/pom.xml | 38 ++++++++++++++++++++++++++ xmlquery/pom.xml | 56 +++++++++++++++++++++++++++++++++++++- 27 files changed, 1421 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6c979a3..f6b77a3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Release 0.10 - Current Development * OODT-854 Enable File Manager and Resource Manager to collect configuration files by parsing a directory tree recursively (luca) +* OODT-859 Add Bundle Headers to jars/wars for OSGI compatibility (magicaltrout) Release 0.9 - 05/31/2015 http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/catalog/pom.xml ---------------------------------------------------------------------- diff --git a/catalog/pom.xml b/catalog/pom.xml index 3de13e6..e8c6e8c 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -23,6 +23,7 @@ <version>0.10-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>cas-catalog</artifactId> <name>OODT CAS Virtual Catalog and Integration Service.</name> <description>CAS Catalog is an effort to virtualize underlying @@ -35,8 +36,43 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/catalog</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/catalog</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.catalog.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> <activation> <activeByDefault>false</activeByDefault> @@ -109,6 +145,26 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.catalog.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> <resources> <resource> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/cli/pom.xml ---------------------------------------------------------------------- diff --git a/cli/pom.xml b/cli/pom.xml index 020818a..b8a9cd0 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -28,8 +28,44 @@ </parent> <artifactId>cas-cli</artifactId> <name>CAS Command Line Interface</name> + <packaging>${packaging.type}</packaging> + <properties> + <packaging.type>jar</packaging.type> + </properties> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.cli.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> <activation> <activeByDefault>false</activeByDefault> @@ -77,6 +113,26 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.cli.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> <dependencies> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/commons/pom.xml ---------------------------------------------------------------------- diff --git a/commons/pom.xml b/commons/pom.xml index ed5f8ee..30a70ff 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -26,13 +26,16 @@ </parent> <artifactId>oodt-commons</artifactId> <name>Common Utilities</name> - <packaging>jar</packaging> + <packaging>${packaging.type}</packaging> <description>Apache OODT Common Utilities Project</description> <scm> <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/commons</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <resources> <resource> @@ -71,11 +74,66 @@ <redirectTestOutputToFile>true</redirectTestOutputToFile> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.commons.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.commons.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/crawler/pom.xml ---------------------------------------------------------------------- diff --git a/crawler/pom.xml b/crawler/pom.xml index 6e9c9af..501dfbd 100644 --- a/crawler/pom.xml +++ b/crawler/pom.xml @@ -27,11 +27,15 @@ the License. <artifactId>cas-crawler</artifactId> <name>Catalog and Archive Crawling Framework</name> <description>The Catalog and Archive Service Crawling Framework.</description> + <packaging>${packaging.type}</packaging> <scm> <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/crawler</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/crawler</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/crawler</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <plugins> <plugin> @@ -76,6 +80,28 @@ the License. </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.crawl.*</Export-Package> + <Main-Class>org.apache.oodt.cas.crawl.CrawlerLauncher</Main-Class> + <Import-Package>*;resolution:=optional</Import-Package> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> <resources> <resource> @@ -90,6 +116,41 @@ the License. </resource> </resources> </build> + <profiles> + <profile> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <id>create-osgi-bundles-from-dependencies</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.crawl.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + <Main-Class>org.apache.oodt.cas.crawl.CrawlerLauncher</Main-Class> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <dependencies> <dependency> <groupId>org.apache.oodt</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/filemgr/pom.xml ---------------------------------------------------------------------- diff --git a/filemgr/pom.xml b/filemgr/pom.xml index 77c7f07..e0781ff 100644 --- a/filemgr/pom.xml +++ b/filemgr/pom.xml @@ -23,6 +23,7 @@ <version>0.10-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>cas-filemgr</artifactId> <name>Catalog and Archive File Management Component</name> <description>The file management component of a Catalog and Archive Service. This component @@ -35,6 +36,9 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/filemgr</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/filemgr</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <directory>target</directory> <outputDirectory>target/classes</outputDirectory> @@ -61,6 +65,7 @@ </testResource> </testResources> <plugins> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId> @@ -105,11 +110,35 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.filemgr.*</Export-Package> + <Main-Class>org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient</Main-Class> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> <profiles> <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -136,6 +165,39 @@ </plugins> </build> </profile> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.filemgr.*</Export-Package> + <Main-Class>org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient</Main-Class> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> </profiles> <repositories> <repository> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/grid/pom.xml ---------------------------------------------------------------------- diff --git a/grid/pom.xml b/grid/pom.xml index d1f0eaf..b240f48 100644 --- a/grid/pom.xml +++ b/grid/pom.xml @@ -25,7 +25,7 @@ the License. </parent> <artifactId>web-grid</artifactId> <name>OODT Web Grid</name> - <packaging>war</packaging> + <packaging>${packaging.type}</packaging> <description>The OODT grid services (product and profile services) use CORBA or RMI as their underlying network transport. However, limitations of CORBA and RMI make them inappropriate for large-scale @@ -62,6 +62,9 @@ the License. <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/grid</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/grid</url> </scm> + <properties> + <packaging.type>war</packaging.type> + </properties> <build> <plugins> <plugin> @@ -72,8 +75,62 @@ the License. </configuration> <version>2.5</version> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.grid.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> + <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>war</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.grid.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <dependencies> <dependency> <groupId>org.apache.oodt</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/metadata/pom.xml ---------------------------------------------------------------------- diff --git a/metadata/pom.xml b/metadata/pom.xml index aafcb96..32ee2d4 100644 --- a/metadata/pom.xml +++ b/metadata/pom.xml @@ -24,6 +24,7 @@ the License. <version>0.10-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>cas-metadata</artifactId> <name>Catalog and Archive Service Generic Multi-valued Metadata Container</name> <description>A Multi-valued, generic Metadata container class. The class uses an internal @@ -41,6 +42,9 @@ the License. <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/metadata</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/metadata</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <resources> <resource> @@ -77,10 +81,62 @@ the License. </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.metadata.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.metadata.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/opendapps/pom.xml ---------------------------------------------------------------------- diff --git a/opendapps/pom.xml b/opendapps/pom.xml index 3ddd59d..ecaf3c4 100644 --- a/opendapps/pom.xml +++ b/opendapps/pom.xml @@ -35,6 +35,10 @@ <version>0.10-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <plugins> <plugin> @@ -55,8 +59,62 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.opendapps.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> + <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.opendapps.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <dependencies> <dependency> <groupId>edu.ucar</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/pcs/core/pom.xml ---------------------------------------------------------------------- diff --git a/pcs/core/pom.xml b/pcs/core/pom.xml index cf52107..b1b36ff 100644 --- a/pcs/core/pom.xml +++ b/pcs/core/pom.xml @@ -26,10 +26,13 @@ the License. <relativePath>../../core/pom.xml</relativePath> </parent> <name>Process Control System Core Package</name> - <packaging>jar</packaging> + <packaging>${packaging.type}</packaging> <description>The Process Control System's core system framework. PCS is an agglomeration of CAS services and components needed to build a science data system. </description> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <plugins> <plugin> @@ -54,9 +57,65 @@ the License. </goals> </execution> </executions> - </plugin> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.pcs.*</Export-Package> + <Main-Class>org.apache.oodt.pcs.tools.PCSHealthMonitor</Main-Class> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> + <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.pcs.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + <Main-Class>org.apache.oodt.pcs.tools.PCSHealthMonitor</Main-Class> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <dependencies> <dependency> <groupId>org.apache.oodt</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/pcs/input/pom.xml ---------------------------------------------------------------------- diff --git a/pcs/input/pom.xml b/pcs/input/pom.xml index 2040cc4..3a5f05b 100644 --- a/pcs/input/pom.xml +++ b/pcs/input/pom.xml @@ -26,10 +26,13 @@ the License. <relativePath>../../core/pom.xml</relativePath> </parent> <name>Process Control System Input Data Package</name> - <packaging>jar</packaging> + <packaging>${packaging.type}</packaging> <description>The Process Control System's data handling package. This package contains data structures and readers and writers to write an input file format similar to HDF, as represented in XML. </description> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <plugins> <plugin> @@ -50,7 +53,27 @@ the License. <include>**/*Test*.java</include> </includes> </configuration> - </plugin> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.pcs.input.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> <resources> <resource> @@ -62,6 +85,40 @@ the License. </resource> </resources> </build> + <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.pcs.input.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <dependencies> <dependency> <groupId>org.apache.oodt</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/pcs/opsui/pom.xml ---------------------------------------------------------------------- diff --git a/pcs/opsui/pom.xml b/pcs/opsui/pom.xml index 08697ac..8cb5389 100755 --- a/pcs/opsui/pom.xml +++ b/pcs/opsui/pom.xml @@ -19,7 +19,7 @@ the License. <modelVersion>4.0.0</modelVersion> <artifactId>pcs-opsui</artifactId> - <packaging>war</packaging> + <packaging>${packaging.type}</packaging> <parent> <groupId>org.apache.oodt</groupId> <artifactId>oodt-core</artifactId> @@ -32,6 +32,7 @@ the License. <jetty.version>6.1.25</jetty.version> <slf4j.version>1.5.8</slf4j.version> <log4j.version>1.2.14</log4j.version> + <packaging.type>war</packaging.type> </properties> <dependencies> <dependency> @@ -122,6 +123,38 @@ the License. </dependency> </dependencies> <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>war</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.pcs.opsui.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> <profile> <id>audit</id> <activation> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/pcs/services/pom.xml ---------------------------------------------------------------------- diff --git a/pcs/services/pom.xml b/pcs/services/pom.xml index 37fca00..40e94c2 100644 --- a/pcs/services/pom.xml +++ b/pcs/services/pom.xml @@ -23,12 +23,51 @@ the License. <version>0.10-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> - <groupId>org.apache.oodt</groupId> - <artifactId>pcs-services</artifactId> - <packaging>war</packaging> + <artifactId>pcs-services</artifactId> + <packaging>${packaging.type}</packaging> <name>OODT Process Control System JAX-RS service layer</name> <description>A web application for exposing services form the underlying OODT Process Control System via the JAX-RS specification.</description> + <properties> + <packaging.type>war</packaging.type> + </properties> + <build> + </build> + + <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>war</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.pcs.services.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <dependencies> <dependency> <groupId>org.apache.oodt</groupId> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/pge/pom.xml ---------------------------------------------------------------------- diff --git a/pge/pom.xml b/pge/pom.xml index 45d49d5..b3f9eba 100644 --- a/pge/pom.xml +++ b/pge/pom.xml @@ -25,9 +25,13 @@ the License. <relativePath>../core/pom.xml</relativePath> </parent> <artifactId>cas-pge</artifactId> + <packaging>${packaging.type}</packaging> <name>CAS PGE Adaptor Framework</name> <description>Allows data processing jobs not written in conformance with the PCS PGE interface to be run within the PCS.</description> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <plugins> @@ -53,12 +57,16 @@ the License. </goals> </execution> </executions> - </plugin> + </plugin> + </plugins> </build> <profiles> <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -81,7 +89,61 @@ the License. </goals> </execution> </executions> - </plugin> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.pcs.services.*</Export-Package> + <Main-Class>org.apache.oodt.cas.pge.PGETask</Main-Class> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.pcs.services.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + <Main-Class>org.apache.oodt.cas.pge.PGETask</Main-Class> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/product/pom.xml ---------------------------------------------------------------------- diff --git a/product/pom.xml b/product/pom.xml index 78b8ee1..61f791a 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -25,6 +25,7 @@ </parent> <artifactId>oodt-product</artifactId> <name>Product Service</name> + <packaging>${packaging.type}</packaging> <description> The Product Service provides access to data products. Products can be scientific datasets, images, documents, or anything with an electronic @@ -39,6 +40,9 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/product</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/product</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <resources> <resource> @@ -63,6 +67,9 @@ <profiles> <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -80,6 +87,58 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/profile/pom.xml ---------------------------------------------------------------------- diff --git a/profile/pom.xml b/profile/pom.xml index 6b7b90a..e6f7c1a 100644 --- a/profile/pom.xml +++ b/profile/pom.xml @@ -25,6 +25,7 @@ </parent> <artifactId>oodt-profile</artifactId> <name>Profile Service</name> + <packaging>${packaging.type}</packaging> <description>The Profile Service describes and locates resources using metadata descriptions. These descriptions, called profiles, tell of a resource's inception, composition, and location using a mix of @@ -36,6 +37,9 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/profile</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/profile</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <resources> <resource> @@ -52,11 +56,66 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/protocol/api/pom.xml ---------------------------------------------------------------------- diff --git a/protocol/api/pom.xml b/protocol/api/pom.xml index 27aef06..51dbc68 100644 --- a/protocol/api/pom.xml +++ b/protocol/api/pom.xml @@ -20,9 +20,47 @@ </parent> <artifactId>cas-protocol-api</artifactId> <name>CAS Protocol</name> + <packaging>${packaging.type}</packaging> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + <Main-Class>org.apache.oodt.cas.protocol.system.CLProtocolManager</Main-Class> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -49,6 +87,9 @@ </build> </profile> </profiles> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <plugins> <plugin> @@ -74,6 +115,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.*</Export-Package> + <Main-Class>org.apache.oodt.cas.protocol.system.CLProtocolManager</Main-Class> + <Import-Package>*;resolution:=optional</Import-Package> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> <resources> <resource> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/protocol/ftp/pom.xml ---------------------------------------------------------------------- diff --git a/protocol/ftp/pom.xml b/protocol/ftp/pom.xml index 7a53933..5546144 100644 --- a/protocol/ftp/pom.xml +++ b/protocol/ftp/pom.xml @@ -20,9 +20,45 @@ </parent> <artifactId>cas-protocol-ftp</artifactId> <name>CAS Protocol FTP Implementation</name> + <packaging>${packaging.type}</packaging> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.ftp.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -45,10 +81,34 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.ftp.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> </profile> </profiles> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <resources> <resource> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/protocol/http/pom.xml ---------------------------------------------------------------------- diff --git a/protocol/http/pom.xml b/protocol/http/pom.xml index cbe7757..c17c7c5 100644 --- a/protocol/http/pom.xml +++ b/protocol/http/pom.xml @@ -18,11 +18,47 @@ <version>0.10-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>cas-protocol-http</artifactId> <name>CAS Protocol HTTP Implementation</name> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.http.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -45,10 +81,33 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.http.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> </profile> </profiles> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <resources> <resource> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/protocol/imaps/pom.xml ---------------------------------------------------------------------- diff --git a/protocol/imaps/pom.xml b/protocol/imaps/pom.xml index 2d299b7..3310229 100644 --- a/protocol/imaps/pom.xml +++ b/protocol/imaps/pom.xml @@ -18,11 +18,47 @@ <version>0.10-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>cas-protocol-imaps</artifactId> <name>CAS Protocol IMAPS Implementation</name> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.imaps.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -49,6 +85,9 @@ </build> </profile> </profiles> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <resources> <resource> @@ -59,6 +98,29 @@ </includes> </resource> </resources> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.imaps.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/protocol/sftp/pom.xml ---------------------------------------------------------------------- diff --git a/protocol/sftp/pom.xml b/protocol/sftp/pom.xml index c449e6e..ec31821 100644 --- a/protocol/sftp/pom.xml +++ b/protocol/sftp/pom.xml @@ -18,11 +18,47 @@ <version>0.10-SNAPSHOT</version> <relativePath>../../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>cas-protocol-sftp</artifactId> <name>CAS Protocol SFTP Implementation</name> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.sftp.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> <activation> <activeByDefault>false</activeByDefault> </activation> @@ -50,7 +86,33 @@ </build> </profile> </profiles> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.protocol.sftp.*</Export-Package> + <Import-Package>*;resolution:=optional</Import-Package> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> <resources> <resource> <targetPath>org/apache/oodt/cas/protocol/sftp</targetPath> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/pushpull/pom.xml ---------------------------------------------------------------------- diff --git a/pushpull/pom.xml b/pushpull/pom.xml index b38ea98..ee3b1fb 100644 --- a/pushpull/pom.xml +++ b/pushpull/pom.xml @@ -56,11 +56,45 @@ </goals> </execution> </executions> - </plugin> + </plugin> </plugins> </build> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.profile.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + <Main-Class>org.apache.oodt.cas.pushpull.daemon.DaemonLauncher</Main-Class> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/resource/pom.xml ---------------------------------------------------------------------- diff --git a/resource/pom.xml b/resource/pom.xml index de807d6..aebc0a7 100644 --- a/resource/pom.xml +++ b/resource/pom.xml @@ -23,6 +23,7 @@ the License. <version>0.10-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>cas-resource</artifactId> <name>Catalog and Archive Resource Management Component</name> <description>The resource management component of a Catalog and Archive Service. This component @@ -33,6 +34,45 @@ the License. <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/resource</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/resource</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> + <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.resource.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + <Main-Class>org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient</Main-Class> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <build> <plugins> <plugin> @@ -77,6 +117,28 @@ the License. </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.resource.*</Export-Package> + <Main-Class>org.apache.oodt.cas.resource.system.XmlRpcResourceManagerClient</Main-Class> + <Import-Package>*;resolution:=optional</Import-Package> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> <dependencies> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/sso/pom.xml ---------------------------------------------------------------------- diff --git a/sso/pom.xml b/sso/pom.xml index 5b5aba9..ad1e180 100644 --- a/sso/pom.xml +++ b/sso/pom.xml @@ -25,10 +25,47 @@ the License. </parent> <artifactId>oodt-sso</artifactId> <name>OODT Single Sign On Security Package</name> - <packaging>jar</packaging> - <properties /> + <packaging>${packaging.type}</packaging> + <properties> + <packaging.type>jar</packaging.type> + </properties> + <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.security.sso.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> <build> - <plugins /> + <plugins> + </plugins> </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/workflow/pom.xml ---------------------------------------------------------------------- diff --git a/workflow/pom.xml b/workflow/pom.xml index e87d480..4b28ca1 100644 --- a/workflow/pom.xml +++ b/workflow/pom.xml @@ -24,6 +24,7 @@ the License. <version>0.10-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>cas-workflow</artifactId> <name>Catalog and Archive Workflow Management Component</name> <description>The workflow management component of a Catalog and Archive Service. This component @@ -31,6 +32,9 @@ the License. provides some out of the box backend implementations of them (including one based on the javax.sql.DataSource interface). This component provides everything that you need to execute workflows, and science processing pipelines.</description> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <plugins> <plugin> @@ -74,11 +78,46 @@ the License. </goals> </execution> </executions> - </plugin> + </plugin> </plugins> </build> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>bundle</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.cas.workflow.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + <Main-Class>org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient</Main-Class> + <Import-Package>*;resolution:=optional</Import-Package> + + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> <activation> <activeByDefault>false</activeByDefault> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/xmlps/pom.xml ---------------------------------------------------------------------- diff --git a/xmlps/pom.xml b/xmlps/pom.xml index d18055e..32778b3 100644 --- a/xmlps/pom.xml +++ b/xmlps/pom.xml @@ -24,6 +24,7 @@ <version>0.10-SNAPSHOT</version> <relativePath>../core/pom.xml</relativePath> </parent> + <packaging>${packaging.type}</packaging> <artifactId>oodt-xmlps</artifactId> <name>XML-configured, DBMS-based Product and Profile Server</name> <version>0.10-SNAPSHOT</version> @@ -32,6 +33,43 @@ sit on top of Web-Grid and other Product and Profile server contexts for rapid deployment and integration. </description> + <profiles> + <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.xmlps.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> <resources> http://git-wip-us.apache.org/repos/asf/oodt/blob/b53fa99d/xmlquery/pom.xml ---------------------------------------------------------------------- diff --git a/xmlquery/pom.xml b/xmlquery/pom.xml index 91abbc8..a08a85d 100644 --- a/xmlquery/pom.xml +++ b/xmlquery/pom.xml @@ -25,7 +25,7 @@ </parent> <artifactId>oodt-xmlquery</artifactId> <name>Query Expression</name> - <packaging>jar</packaging> + <packaging>${packaging.type}</packaging> <description>This component provides a way to express queries in a generic manner. Its centerpiece is a class called XMLQuery that uses boolean postfix expressions to capture the domain, range, and @@ -39,6 +39,9 @@ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/xmlquery</developerConnection> <url>http://svn.apache.org/viewvc/oodt/trunk/xmlquery</url> </scm> + <properties> + <packaging.type>jar</packaging.type> + </properties> <build> <resources> <resource> @@ -61,10 +64,61 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> </plugins> </build> <profiles> <profile> + <id>create-osgi-bundles-from-dependencies</id> + <properties> + <packaging.type>jar</packaging.type> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.3.7</version> + <configuration> + <supportedProjectTypes> + <supportedProjectType>jar</supportedProjectType> + <supportedProjectType>bundle</supportedProjectType> + <supportedProjectType>war</supportedProjectType> + </supportedProjectTypes> + <instructions> + <Bundle-Name>${project.artifactId}</Bundle-Name> + <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName> + <Bundle-Description>OSGI version of ${project.name}</Bundle-Description> + <Export-Package>org.apache.oodt.*</Export-Package> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <Import-Package>*;resolution:=optional</Import-Package> + </instructions> + </configuration> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>audit</id> <activation> <activeByDefault>false</activeByDefault>
