Author: jm
Date: 2012-04-04 18:29:35 -0700 (Wed, 04 Apr 2012)
New Revision: 28742
Removed:
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/osgi.bnd
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/osgi.bnd
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/osgi.bnd
Modified:
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/pom.xml
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/pom.xml
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/pom.xml
Log:
Fixes #825: Updated archetypes so that OSGi metadata is embedded in pom.xml
rather than osgi.bnd
Deleted:
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/osgi.bnd
===================================================================
---
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/osgi.bnd
2012-04-05 01:28:39 UTC (rev 28741)
+++
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/osgi.bnd
2012-04-05 01:29:35 UTC (rev 28742)
@@ -1,10 +0,0 @@
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-#literal()
-Import-Package: *
-Private-Package: ${bundle.namespace}.internal.*
-Export-Package: ${bundle.namespace}
-Bundle-Activator: ${bundle.namespace}.internal.CyActivator
-#end
Modified:
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/pom.xml
2012-04-05 01:28:39 UTC (rev 28741)
+++
core3/support/trunk/archetypes/api-provider-app/src/main/resources/archetype-resources/pom.xml
2012-04-05 01:29:35 UTC (rev 28742)
@@ -89,8 +89,10 @@
#literal()
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
+
<Export-Package>${bundle.namespace}</Export-Package>
+
<Private-Package>${bundle.namespace}.internal.*</Private-Package>
+
<Bundle-Activator>${bundle.namespace}.internal.CyActivator</Bundle-Activator>
#end
- <_include>-osgi.bnd</_include>
</instructions>
</configuration>
</plugin>
Deleted:
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/osgi.bnd
===================================================================
---
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/osgi.bnd
2012-04-05 01:28:39 UTC (rev 28741)
+++
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/osgi.bnd
2012-04-05 01:29:35 UTC (rev 28742)
@@ -1,8 +0,0 @@
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-Import-Package: *
-Private-Package: ${bundle.namespace}.internal.*
-Export-Package: ${bundle.namespace}
-Bundle-Activator: ${bundle.namespace}.internal.CyActivator
Modified:
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/pom.xml
2012-04-05 01:28:39 UTC (rev 28741)
+++
core3/support/trunk/archetypes/cyaction-app/src/main/resources/archetype-resources/pom.xml
2012-04-05 01:29:35 UTC (rev 28742)
@@ -87,8 +87,10 @@
#literal()
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
+
<Export-Package>${bundle.namespace}</Export-Package>
+
<Private-Package>${bundle.namespace}.internal.*</Private-Package>
+
<Bundle-Activator>${bundle.namespace}.internal.CyActivator</Bundle-Activator>
#end
- <_include>-osgi.bnd</_include>
</instructions>
</configuration>
</plugin>
Deleted:
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/osgi.bnd
===================================================================
---
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/osgi.bnd
2012-04-05 01:28:39 UTC (rev 28741)
+++
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/osgi.bnd
2012-04-05 01:29:35 UTC (rev 28742)
@@ -1,9 +0,0 @@
-#-----------------------------------------------------------------
-# Use this file to add customized Bnd instructions for the bundle
-#-----------------------------------------------------------------
-
-#literal()
-Import-Package: *
-Private-Package: ${bundle.namespace}.internal.*
-Bundle-Activator: ${bundle.namespace}.internal.CyActivator
-#end
Modified:
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/pom.xml
===================================================================
---
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/pom.xml
2012-04-05 01:28:39 UTC (rev 28741)
+++
core3/support/trunk/archetypes/task-app/src/main/resources/archetype-resources/pom.xml
2012-04-05 01:29:35 UTC (rev 28742)
@@ -90,8 +90,10 @@
#literal()
<Bundle-SymbolicName>${bundle.symbolicName}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
+
<Export-Package>${bundle.namespace}</Export-Package>
+
<Private-Package>${bundle.namespace}.internal.*</Private-Package>
+
<Bundle-Activator>${bundle.namespace}.internal.CyActivator</Bundle-Activator>
#end
- <_include>-osgi.bnd</_include>
</instructions>
</configuration>
</plugin>
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
