diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-19 10:42:06 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-19 10:42:06 +0000 |
| commit | 6ec4eafe0cda08a7b3fb862aa4027e8ac280f832 (patch) | |
| tree | 11b74eb7865240d8345b5cdc4af308da682fc1f7 /sandbox/slaws/runtimecompat/1xbundle | |
| parent | a50e7af29c5695006c4227d4d7e36cf99eff254a (diff) | |
Sort out the 1.x bundles and launcher manifests and the relationships between them. Step closer to getting 1.x and 2.x up together. Still getting NPE in 1.x on start.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882097 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sandbox/slaws/runtimecompat/1xbundle')
| -rw-r--r-- | sandbox/slaws/runtimecompat/1xbundle/pom.xml | 45 |
1 files changed, 3 insertions, 42 deletions
diff --git a/sandbox/slaws/runtimecompat/1xbundle/pom.xml b/sandbox/slaws/runtimecompat/1xbundle/pom.xml index df44caf9f5..64d59b77ed 100644 --- a/sandbox/slaws/runtimecompat/1xbundle/pom.xml +++ b/sandbox/slaws/runtimecompat/1xbundle/pom.xml @@ -314,7 +314,7 @@ </configuration> </execution> </executions> - </plugin--> + </plugin --> <plugin> <groupId>org.apache.felix</groupId> @@ -322,7 +322,8 @@ <extensions>true</extensions> <configuration> <instructions> - <Export-Package>org.apache.tuscany.sca.node</Export-Package> + <Export-Package>org.apache.tuscany.sca.node;version=1.6</Export-Package> + <Import-Package>!com.*,!javax.*,!net.*,!org.*,!nu.*,!oracle.*,!sun.*,*</Import-Package> <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName> <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> @@ -330,46 +331,6 @@ </instructions> </configuration> </plugin> - - <!-- plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <executions> - <execution> - <id>build-1x-bundle</id> - <phase>process-classes</phase> - <goals> - <goal>bundle</goal> - </goals> - <configuration> - <instructions> - <Export-Package>org.apache.tuscany.sca.node</Export-Package> - <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName> - <Bundle-ClassPath>.,${maven-dependencies}</Bundle-ClassPath> - </instructions> - </configuration> - </execution> - </executions> - </plugin--> - - <!-- plugin> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <cpFile>${project.build.directory}/classes/org/apache/tuscany/sca/installer/.classpath</cpFile> - <includeScope>runtime</includeScope> - </configuration> - <executions> - <execution> - <id>build-classpath</id> - <phase>compile</phase> - <goals> - <goal>build-classpath</goal> - </goals> - </execution> - </executions> - </plugin --> - <!-- plugin> <groupId>org.apache.maven.plugins</groupId> |