http://git-wip-us.apache.org/repos/asf/oodt/blob/c9b8528b/26.patch ---------------------------------------------------------------------- diff --git a/26.patch b/26.patch new file mode 100755 index 0000000..c19c0b0 --- /dev/null +++ b/26.patch @@ -0,0 +1,3506 @@ +From a7be6105471ca9d44c8714df1232220bb15957eb Mon Sep 17 00:00:00 2001 +From: Tom Barber <[email protected]> +Date: Thu, 23 Jul 2015 16:08:49 +0100 +Subject: [PATCH 1/7] filemgr convert to bundle + +--- + filemgr/pom.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 49 insertions(+) + +diff --git a/filemgr/pom.xml b/filemgr/pom.xml +index 77c7f07..630a542 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>bundle</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 +@@ -61,6 +62,7 @@ + </testResource> + </testResources> + <plugins> ++ + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> +@@ -105,6 +107,29 @@ + </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> ++ <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> + <profiles> +@@ -136,6 +161,30 @@ + </plugins> + </build> + </profile> ++ <profile> ++ <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> ++ <extensions>true</extensions> ++ <executions> ++ <execution> ++ <id>wrap-my-dependency</id> ++ <goals> ++ <goal>wrap</goal> ++ </goals> ++ <configuration> ++ <wrapImportPackage>;</wrapImportPackage> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ </plugins> ++ </build> ++ </profile> + </profiles> + <repositories> + <repository> + +From 94c0b3815052b0f230096cdbc68f11601f271c9a Mon Sep 17 00:00:00 2001 +From: Tom Barber <[email protected]> +Date: Thu, 23 Jul 2015 16:15:53 +0100 +Subject: [PATCH 2/7] OODT-859 convert filemgr to bundle, extra profile to add + dependencies into jar to stop karaf crying + +--- + filemgr/pom.xml | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +diff --git a/filemgr/pom.xml b/filemgr/pom.xml +index 630a542..c534c26 100644 +--- a/filemgr/pom.xml ++++ b/filemgr/pom.xml +@@ -123,9 +123,6 @@ + <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> +@@ -169,18 +166,24 @@ + <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> +- <executions> +- <execution> +- <id>wrap-my-dependency</id> +- <goals> +- <goal>wrap</goal> +- </goals> +- <configuration> +- <wrapImportPackage>;</wrapImportPackage> +- </configuration> +- </execution> +- </executions> + </plugin> + </plugins> + </build> + +From 2e3d21ccd698689a8cc1e37649061e5c812d3e5f Mon Sep 17 00:00:00 2001 +From: Tom Barber <[email protected]> +Date: Thu, 23 Jul 2015 18:07:47 +0100 +Subject: [PATCH 3/7] OODT-859 convert to bundles + +--- + catalog/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++ + cli/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++ + commons/pom.xml | 51 +++++++++++++++++++++++++++++++++++++++++++- + crawler/pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++ + filemgr/pom.xml | 1 + + grid/pom.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++ + metadata/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++ + opendapps/pom.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++ + pcs/core/pom.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++- + pcs/input/pom.xml | 53 ++++++++++++++++++++++++++++++++++++++++++++- + pcs/opsui/pom.xml | 49 ++++++++++++++++++++++++++++++++++++++++++ + pcs/services/pom.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++-- + pge/pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++-- + product/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++ + profile/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++ + protocol/api/pom.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++ + protocol/ftp/pom.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++ + protocol/http/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++ + protocol/imaps/pom.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++ + protocol/sftp/pom.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++ + pushpull/pom.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++- + resource/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ + sso/pom.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++- + workflow/pom.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++- + xmlps/pom.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++ + xmlquery/pom.xml | 48 +++++++++++++++++++++++++++++++++++++++++ + 26 files changed, 1306 insertions(+), 10 deletions(-) + +diff --git a/catalog/pom.xml b/catalog/pom.xml +index 3de13e6..6a9c515 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>bundle</packaging> + <artifactId>cas-catalog</artifactId> + <name>OODT CAS Virtual Catalog and Integration Service.</name> + <description>CAS Catalog is an effort to virtualize underlying +@@ -37,6 +38,35 @@ + </scm> + <profiles> + <profile> ++ <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.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 +139,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> +diff --git a/cli/pom.xml b/cli/pom.xml +index 020818a..38645b2 100644 +--- a/cli/pom.xml ++++ b/cli/pom.xml +@@ -28,8 +28,38 @@ + </parent> + <artifactId>cas-cli</artifactId> + <name>CAS Command Line Interface</name> ++ <packaging>bundle</packaging> + <profiles> + <profile> ++ <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.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 +107,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> +diff --git a/commons/pom.xml b/commons/pom.xml +index ed5f8ee..8523d4e 100644 +--- a/commons/pom.xml ++++ b/commons/pom.xml +@@ -26,7 +26,7 @@ + </parent> + <artifactId>oodt-commons</artifactId> + <name>Common Utilities</name> +- <packaging>jar</packaging> ++ <packaging>bundle</packaging> + <description>Apache OODT Common Utilities Project</description> + <scm> + <connection>scm:svn:https://svn.apache.org/repos/asf/oodt/trunk/commons</connection> +@@ -71,10 +71,59 @@ + <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> ++ <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> + <activation> + <activeByDefault>false</activeByDefault> +diff --git a/crawler/pom.xml b/crawler/pom.xml +index 6e9c9af..278686b 100644 +--- a/crawler/pom.xml ++++ b/crawler/pom.xml +@@ -27,6 +27,7 @@ the License. + <artifactId>cas-crawler</artifactId> + <name>Catalog and Archive Crawling Framework</name> + <description>The Catalog and Archive Service Crawling Framework.</description> ++ <packaging>bundle</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> +@@ -76,6 +77,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 +113,38 @@ the License. + </resource> + </resources> + </build> ++ <profiles> ++ <profile> ++ <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> +diff --git a/filemgr/pom.xml b/filemgr/pom.xml +index c534c26..8f0afc7 100644 +--- a/filemgr/pom.xml ++++ b/filemgr/pom.xml +@@ -123,6 +123,7 @@ + <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> +diff --git a/grid/pom.xml b/grid/pom.xml +index d1f0eaf..9fdbc28 100644 +--- a/grid/pom.xml ++++ b/grid/pom.xml +@@ -72,8 +72,59 @@ 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> ++ <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> +diff --git a/metadata/pom.xml b/metadata/pom.xml +index aafcb96..bbad7db 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>jar</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 +@@ -77,10 +78,59 @@ 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> ++ <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> +diff --git a/opendapps/pom.xml b/opendapps/pom.xml +index 3ddd59d..0e2e75b 100644 +--- a/opendapps/pom.xml ++++ b/opendapps/pom.xml +@@ -35,6 +35,7 @@ + <version>0.10-SNAPSHOT</version> + <relativePath>../core/pom.xml</relativePath> + </parent> ++ <packaging>jar</packaging> + <build> + <plugins> + <plugin> +@@ -55,8 +56,59 @@ + </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> ++ <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> +diff --git a/pcs/core/pom.xml b/pcs/core/pom.xml +index cf52107..9e09e4c 100644 +--- a/pcs/core/pom.xml ++++ b/pcs/core/pom.xml +@@ -54,9 +54,62 @@ 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> ++ <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> +diff --git a/pcs/input/pom.xml b/pcs/input/pom.xml +index 2040cc4..fcae9bb 100644 +--- a/pcs/input/pom.xml ++++ b/pcs/input/pom.xml +@@ -50,7 +50,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 +82,37 @@ the License. + </resource> + </resources> + </build> ++ <profiles> ++ <profile> ++ <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.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> +diff --git a/pcs/opsui/pom.xml b/pcs/opsui/pom.xml +index 08697ac..f2a3a31 100755 +--- a/pcs/opsui/pom.xml ++++ b/pcs/opsui/pom.xml +@@ -122,6 +122,35 @@ the License. + </dependency> + </dependencies> + <profiles> ++ <profile> ++ <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.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> +@@ -189,6 +218,26 @@ the License. + <debug>true</debug> + </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.pcs.opsui.*</Export-Package> ++ <Import-Package>*;resolution:=optional</Import-Package> ++ </instructions> ++ </configuration> ++ <extensions>true</extensions> ++ </plugin> + </plugins> + </build> + </project> +diff --git a/pcs/services/pom.xml b/pcs/services/pom.xml +index 37fca00..a6c346f 100644 +--- a/pcs/services/pom.xml ++++ b/pcs/services/pom.xml +@@ -23,12 +23,66 @@ the License. + <version>0.10-SNAPSHOT</version> + <relativePath>../../core/pom.xml</relativePath> + </parent> +- <groupId>org.apache.oodt</groupId> +- <artifactId>pcs-services</artifactId> ++ <artifactId>pcs-services</artifactId> + <packaging>war</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> ++ <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> ++ <Import-Package>*;resolution:=optional</Import-Package> ++ </instructions> ++ </configuration> ++ <extensions>true</extensions> ++ </plugin> ++ </plugins> ++ </build> ++ <profiles> ++ <profile> ++ <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.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> +diff --git a/pge/pom.xml b/pge/pom.xml +index 45d49d5..e47cad2 100644 +--- a/pge/pom.xml ++++ b/pge/pom.xml +@@ -25,6 +25,7 @@ the License. + <relativePath>../core/pom.xml</relativePath> + </parent> + <artifactId>cas-pge</artifactId> ++ <packaging>jar</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> +@@ -53,7 +54,8 @@ the License. + </goals> + </execution> + </executions> +- </plugin> ++ </plugin> ++ + </plugins> + </build> + <profiles> +@@ -81,7 +83,58 @@ 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> ++ <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> +diff --git a/product/pom.xml b/product/pom.xml +index 78b8ee1..4498b70 100644 +--- a/product/pom.xml ++++ b/product/pom.xml +@@ -25,6 +25,7 @@ + </parent> + <artifactId>oodt-product</artifactId> + <name>Product Service</name> ++ <packaging>jar</packaging> + <description> + The Product Service provides access to data products. Products can be + scientific datasets, images, documents, or anything with an electronic +@@ -80,6 +81,55 @@ + </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> ++ <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> +diff --git a/profile/pom.xml b/profile/pom.xml +index 6b7b90a..d029e27 100644 +--- a/profile/pom.xml ++++ b/profile/pom.xml +@@ -25,6 +25,7 @@ + </parent> + <artifactId>oodt-profile</artifactId> + <name>Profile Service</name> ++ <packaging>jar</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 +@@ -52,10 +53,59 @@ + </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> ++ <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> +diff --git a/protocol/api/pom.xml b/protocol/api/pom.xml +index 27aef06..38bece1 100644 +--- a/protocol/api/pom.xml ++++ b/protocol/api/pom.xml +@@ -20,8 +20,40 @@ + </parent> + <artifactId>cas-protocol-api</artifactId> + <name>CAS Protocol</name> ++ <packaging>jar</packaging> + <profiles> + <profile> ++ <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.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> + <activation> + <activeByDefault>false</activeByDefault> +@@ -74,6 +106,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> +diff --git a/protocol/ftp/pom.xml b/protocol/ftp/pom.xml +index 7a53933..f7f77e7 100644 +--- a/protocol/ftp/pom.xml ++++ b/protocol/ftp/pom.xml +@@ -20,8 +20,38 @@ + </parent> + <artifactId>cas-protocol-ftp</artifactId> + <name>CAS Protocol FTP Implementation</name> ++ <packaging>jar</packaging> + <profiles> + <profile> ++ <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.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> + <activation> + <activeByDefault>false</activeByDefault> +@@ -45,6 +75,27 @@ + </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> +diff --git a/protocol/http/pom.xml b/protocol/http/pom.xml +index cbe7757..b2cac68 100644 +--- a/protocol/http/pom.xml ++++ b/protocol/http/pom.xml +@@ -18,10 +18,40 @@ + <version>0.10-SNAPSHOT</version> + <relativePath>../../core/pom.xml</relativePath> + </parent> ++ <packaging>jar</packaging> + <artifactId>cas-protocol-http</artifactId> + <name>CAS Protocol HTTP Implementation</name> + <profiles> + <profile> ++ <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.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> + <activation> + <activeByDefault>false</activeByDefault> +@@ -45,6 +75,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.protocol.http.*</Export-Package> ++ <Import-Package>*;resolution:=optional</Import-Package> ++ </instructions> ++ </configuration> ++ <extensions>true</extensions> ++ </plugin> + </plugins> + </build> + </profile> +diff --git a/protocol/imaps/pom.xml b/protocol/imaps/pom.xml +index 2d299b7..918586d 100644 +--- a/protocol/imaps/pom.xml ++++ b/protocol/imaps/pom.xml +@@ -18,10 +18,40 @@ + <version>0.10-SNAPSHOT</version> + <relativePath>../../core/pom.xml</relativePath> + </parent> ++ <packaging>jar</packaging> + <artifactId>cas-protocol-imaps</artifactId> + <name>CAS Protocol IMAPS Implementation</name> + <profiles> + <profile> ++ <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.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> + <activation> + <activeByDefault>false</activeByDefault> +@@ -59,6 +89,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> +diff --git a/protocol/sftp/pom.xml b/protocol/sftp/pom.xml +index c449e6e..223283f 100644 +--- a/protocol/sftp/pom.xml ++++ b/protocol/sftp/pom.xml +@@ -18,10 +18,40 @@ + <version>0.10-SNAPSHOT</version> + <relativePath>../../core/pom.xml</relativePath> + </parent> ++ <packaging>jar</packaging> + <artifactId>cas-protocol-sftp</artifactId> + <name>CAS Protocol SFTP Implementation</name> + <profiles> + <profile> ++ <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.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> + <activation> + <activeByDefault>false</activeByDefault> +@@ -51,6 +81,29 @@ + </profile> + </profiles> + <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> +diff --git a/pushpull/pom.xml b/pushpull/pom.xml +index b38ea98..3c07a72 100644 +--- a/pushpull/pom.xml ++++ b/pushpull/pom.xml +@@ -56,11 +56,64 @@ + </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.profile.*</Export-Package> ++ <Main-Class>org.apache.oodt.cas.pushpull.daemon.DaemonLauncher</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> ++ <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> +diff --git a/resource/pom.xml b/resource/pom.xml +index de807d6..a6b2ef7 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>jar</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,39 @@ 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> ++ <profiles> ++ <profile> ++ <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.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 +111,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> +diff --git a/sso/pom.xml b/sso/pom.xml +index 5b5aba9..4afe323 100644 +--- a/sso/pom.xml ++++ b/sso/pom.xml +@@ -27,8 +27,61 @@ the License. + <name>OODT Single Sign On Security Package</name> + <packaging>jar</packaging> + <properties /> ++ <profiles> ++ <profile> ++ <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.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> ++ <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> ++ <Import-Package>*;resolution:=optional</Import-Package> ++ ++ </instructions> ++ </configuration> ++ <extensions>true</extensions> ++ </plugin> ++ </plugins> + </build> + <dependencies> + <dependency> +diff --git a/workflow/pom.xml b/workflow/pom.xml +index e87d480..e65a010 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>jar</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 +@@ -74,11 +75,64 @@ 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.cas.workflow.*</Export-Package> ++ <Main-Class>org.apache.oodt.cas.workflow.system.XmlRpcWorkflowManagerClient</Main-Class> ++ ++ </instructions> ++ </configuration> ++ <extensions>true</extensions> ++ </plugin> + </plugins> + </build> + <profiles> + <profile> ++ <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.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> +diff --git a/xmlps/pom.xml b/xmlps/pom.xml +index d18055e..e588388 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>jar</packaging> + <artifactId>oodt-xmlps</artifactId> + <name>XML-configured, DBMS-based Product and Profile Server</name> + <version>0.10-SNAPSHOT</version> +@@ -32,6 +33,37 @@ + 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> ++ <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> + <build> + <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory> + <resources> +@@ -71,6 +103,27 @@ + </systemProperties> + </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.xmlps.*</Export-Package> ++ <Import-Package>*;resolution:=optional</Import-Package> ++ ++ </instructions> ++ </configuration> ++ <extensions>true</extensions> ++ </plugin> + </plugins> + </build> + <dependencies> +diff --git a/xmlquery/pom.xml b/xmlquery/pom.xml +index 91abbc8..dac2e3e 100644 +--- a/xmlquery/pom.xml ++++ b/xmlquery/pom.xml +@@ -61,10 +61,58 @@ + </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> ++ <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> + +From b4966909ab1b908b4b6508d5d2b8e96b63fa5cfe Mon Sep 17 00:00:00 2001 +From: Tom Barber <[email protected]> +Date: Thu, 23 Jul 2015 18:13:34 +0100 +Subject: [PATCH 4/7] changes + +--- + CHANGES.txt | 1 + + grid/web-grid.iml | 53 +++++++++++++++++++++- + .../cas-install/maven-cas-install-plugin.iml | 4 +- + xmlquery/oodt-xmlquery.iml | 5 +- + 4 files changed, 57 insertions(+), 6 deletions(-) + +diff --git a/CHANGES.txt b/CHANGES.txt +index b97b37f..267bd22 100644 +--- a/CHANGES.txt ++++ b/CHANGES.txt +@@ -4,6 +4,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 + +diff --git a/grid/web-grid.iml b/grid/web-grid.iml +index 95c93b5..1f273da 100644 +--- a/grid/web-grid.iml ++++ b/grid/web-grid.iml +@@ -1,5 +1,20 @@ + <?xml version="1.0" encoding="UTF-8"?> + <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> ++ <component name="FacetManager"> ++ <facet type="web" name="Web"> ++ <configuration> ++ <descriptors> ++ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" /> ++ </descriptors> ++ <webroots> ++ <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" /> ++ </webroots> ++ <sourceRoots> ++ <root url="file://$MODULE_DIR$/src/main/java" /> ++ </sourceRoots> ++ </configuration> ++ </facet> ++ </component> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> +@@ -10,6 +25,8 @@ + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> ++ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.5.RELEASE" level="project" /> ++ <orderEntry type="library" name="Maven: joda-time:joda-time:2.7" level="project" /> + <orderEntry type="module" module-name="oodt-commons" /> + <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.1" level="project" /> + <orderEntry type="library" name="Maven: commons-collections:commons-collections:2.1" level="project" /> +@@ -33,10 +50,42 @@ + <orderEntry type="library" name="Maven: xmlrpc:xmlrpc:2.0.1" level="project" /> + <orderEntry type="module" module-name="oodt-profile" /> + <orderEntry type="module" module-name="cas-filemgr" /> ++ <orderEntry type="library" name="Maven: org.apache.tika:tika-parsers:1.7" level="project" /> ++ <orderEntry type="library" name="Maven: org.gagravarr:vorbis-java-tika:0.6" level="project" /> ++ <orderEntry type="library" name="Maven: edu.ucar:netcdf:4.2.20" level="project" /> ++ <orderEntry type="library" name="Maven: edu.ucar:unidataCommon:4.2.20" level="project" /> ++ <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" /> ++ <orderEntry type="library" name="Maven: net.sourceforge.jmatio:jmatio:1.0" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.james:apache-mime4j-core:0.7.2" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.james:apache-mime4j-dom:0.7.2" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.8.1" level="project" /> ++ <orderEntry type="library" name="Maven: org.tukaani:xz:1.5" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:1.8.8" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:1.8.8" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.pdfbox:jempbox:1.8.8" level="project" /> ++ <orderEntry type="library" name="Maven: org.bouncycastle:bcmail-jdk15:1.45" level="project" /> ++ <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.45" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.poi:poi:3.11" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.11" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.11" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.11" level="project" /> ++ <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" /> ++ <orderEntry type="library" name="Maven: org.ccil.cowan.tagsoup:tagsoup:1.2.1" level="project" /> ++ <orderEntry type="library" name="Maven: org.ow2.asm:asm-debug-all:4.1" level="project" /> ++ <orderEntry type="library" name="Maven: com.googlecode.mp4parser:isoparser:1.0.2" level="project" /> ++ <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.0" level="project" /> ++ <orderEntry type="library" name="Ma
<TRUNCATED>
