ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1357656 - in /ace/sandbox/marrs: cnf/repo/ org.apache.ace.discovery.property/ org.apache.ace.gateway.log/ org.apache.ace.identification.property/ org.apache.ace.log/ org.apache.ace.managementagent/ run-target/ run-target/.settings/ run-tar...
Date Thu, 05 Jul 2012 15:01:36 GMT
Author: marrs
Date: Thu Jul  5 15:01:35 2012
New Revision: 1357656

URL: http://svn.apache.org/viewvc?rev=1357656&view=rev
Log:
More fixes, added a run-target project to run the management agent.

Added:
    ace/sandbox/marrs/run-target/
    ace/sandbox/marrs/run-target/.classpath
    ace/sandbox/marrs/run-target/.project
    ace/sandbox/marrs/run-target/.settings/
    ace/sandbox/marrs/run-target/.settings/org.eclipse.jdt.core.prefs
    ace/sandbox/marrs/run-target/bnd.bnd
    ace/sandbox/marrs/run-target/build.xml
    ace/sandbox/marrs/run-target/src/
    ace/sandbox/marrs/run-target/target.bndrun
    ace/sandbox/marrs/run-target/test/
Modified:
    ace/sandbox/marrs/cnf/repo/repository.xml
    ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.log/bnd.bnd
    ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd

Modified: ace/sandbox/marrs/cnf/repo/repository.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/cnf/repo/repository.xml?rev=1357656&r1=1357655&r2=1357656&view=diff
==============================================================================
--- ace/sandbox/marrs/cnf/repo/repository.xml (original)
+++ ace/sandbox/marrs/cnf/repo/repository.xml Thu Jul  5 15:01:35 2012
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <?xml-stylesheet type='text/xsl' href='http://www.osgi.org/www/obr2html.xsl'?>
 
-<repository lastmodified='20120705084857.878' name='Local Repository'>
+<repository lastmodified='20120705151751.388' name='Local Repository'>
   <resource id='aws-common/1.4.0' presentationname='jclouds Amazon AWS Components Core'
symbolicname='aws-common' uri='aws-common/aws-common-1.4.0.jar' version='1.4.0'>
     <description>
       jclouds Core components to access Amazon AWS
@@ -3550,6 +3550,57 @@
       Import package org.osgi.framework ;version=[1.3.0,2.0.0)
     </require>
   </resource>
+  <resource id='org.apache.felix.deploymentadmin/0.9.1.SNAPSHOT' presentationname='Apache
Felix Deployment Admin' symbolicname='org.apache.felix.deploymentadmin' uri='org.apache.felix.deploymentadmin/org.apache.felix.deploymentadmin-0.9.1.jar'
version='0.9.1.SNAPSHOT'>
+    <description>
+      A bundle that implements the Deployment Admin.
+    </description>
+    <size>
+      85411
+    </size>
+    <license>
+      http://www.apache.org/licenses/LICENSE-2.0.txt
+    </license>
+    <documentation>
+      http://www.apache.org/
+    </documentation>
+    <capability name='bundle'>
+      <p n='manifestversion' v='2'/>
+      <p n='presentationname' v='Apache Felix Deployment Admin'/>
+      <p n='symbolicname' v='org.apache.felix.deploymentadmin'/>
+      <p n='version' t='version' v='0.9.1.SNAPSHOT'/>
+    </capability>
+    <capability name='package'>
+      <p n='package' v='org.osgi.service.deploymentadmin'/>
+      <p n='uses' v='org.osgi.framework'/>
+      <p n='version' t='version' v='1.0.0'/>
+    </capability>
+    <capability name='package'>
+      <p n='package' v='org.osgi.service.deploymentadmin.spi'/>
+      <p n='uses' v='org.osgi.framework,org.osgi.service.deploymentadmin'/>
+      <p n='version' t='version' v='1.0.0'/>
+    </capability>
+    <require extend='false' filter='(&amp;(package=org.apache.felix.dm)(version&gt;=3.0.0)(!(version&gt;=4.0.0)))'
multiple='false' name='package' optional='false'>
+      Import package org.apache.felix.dm ;version=[3.0.0,4.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.framework)(version&gt;=1.5.0)(!(version&gt;=2.0.0)))'
multiple='false' name='package' optional='false'>
+      Import package org.osgi.framework ;version=[1.5.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.deploymentadmin)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'
multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.deploymentadmin ;version=[1.0.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.deploymentadmin.spi)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))'
multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.deploymentadmin.spi ;version=[1.0.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.event)(version&gt;=1.2.0)(!(version&gt;=2.0.0)))'
multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.event ;version=[1.2.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.log)(version&gt;=1.3.0)(!(version&gt;=2.0.0)))'
multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.log ;version=[1.3.0,2.0.0)
+    </require>
+    <require extend='false' filter='(&amp;(package=org.osgi.service.packageadmin)(version&gt;=1.2.0)(!(version&gt;=2.0.0)))'
multiple='false' name='package' optional='false'>
+      Import package org.osgi.service.packageadmin ;version=[1.2.0,2.0.0)
+    </require>
+  </resource>
   <resource id='org.apache.felix.eventadmin/1.2.14' presentationname='Apache Felix EventAdmin'
symbolicname='org.apache.felix.eventadmin' uri='org.apache.felix.eventadmin/org.apache.felix.eventadmin-1.2.14.jar'
version='1.2.14'>
     <description>
       This bundle provides an implementation of the OSGi R4 EventAdmin

Modified: ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd?rev=1357656&r1=1357655&r2=1357656&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.discovery.property/bnd.bnd Thu Jul  5 15:01:35 2012
@@ -3,4 +3,7 @@
 	org.apache.ace.util;version=latest,\
 	org.apache.felix.dependencymanager,\
 	org.apache.ace.discovery.api;version=latest,\
-	org.mockito.mockito-all
\ No newline at end of file
+	org.mockito.mockito-all
+Private-Package: org.apache.ace.discovery.property,\
+	org.apache.ace.discovery.property.constants
+Bundle-Activator: org.apache.ace.discovery.property.Activator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd?rev=1357656&r1=1357655&r2=1357656&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.gateway.log/bnd.bnd Thu Jul  5 15:01:35 2012
@@ -6,4 +6,7 @@
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.identification.api;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.gateway.log.store;version=latest
\ No newline at end of file
+	org.apache.ace.gateway.log.store;version=latest
+Private-Package: org.apache.ace.target.log,\
+	org.apache.ace.target.log.task
+Bundle-Activator: org.apache.ace.target.log.Activator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd?rev=1357656&r1=1357655&r2=1357656&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.identification.property/bnd.bnd Thu Jul  5 15:01:35 2012
@@ -4,3 +4,6 @@
 	osgi.core,\
 	org.apache.ace.util;version=latest,\
 	org.mockito.mockito-all
+Private-Package: org.apache.ace.identification.property,\
+	org.apache.ace.identification.property.constants
+Bundle-Activator: org.apache.ace.identification.property.Activator
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.log/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.log/bnd.bnd?rev=1357656&r1=1357655&r2=1357656&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.log/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.log/bnd.bnd Thu Jul  5 15:01:35 2012
@@ -1,3 +1,4 @@
 -buildpath: org.apache.ace.range.api;version=latest,\
 	org.apache.ace.util;version=latest
-Export-Package: org.apache.ace.log
\ No newline at end of file
+Export-Package: org.apache.ace.log
+Private-Package: org.apache.ace.util
\ No newline at end of file

Modified: ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd?rev=1357656&r1=1357655&r2=1357656&view=diff
==============================================================================
--- ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd (original)
+++ ace/sandbox/marrs/org.apache.ace.managementagent/bnd.bnd Thu Jul  5 15:01:35 2012
@@ -33,7 +33,6 @@ Import-Package: !javax.swing,\
 	!org.apache.ace.target.log,\
 	!org.apache.felix.dm.tracker,\
 	!org.osgi.service.useradmin,\
-	!org.osgi.util.tracker,\
 	org.osgi.service.deploymentadmin;version='[1,2)',\
 	org.osgi.service.deploymentadmin.spi;version='[1,2)',\
 	*

Added: ace/sandbox/marrs/run-target/.classpath
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-target/.classpath?rev=1357656&view=auto
==============================================================================
--- ace/sandbox/marrs/run-target/.classpath (added)
+++ ace/sandbox/marrs/run-target/.classpath Thu Jul  5 15:01:35 2012
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="bin_test" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Added: ace/sandbox/marrs/run-target/.project
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-target/.project?rev=1357656&view=auto
==============================================================================
--- ace/sandbox/marrs/run-target/.project (added)
+++ ace/sandbox/marrs/run-target/.project Thu Jul  5 15:01:35 2012
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>run-target</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>bndtools.core.bndbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>bndtools.core.bndnature</nature>
+	</natures>
+</projectDescription>

Added: ace/sandbox/marrs/run-target/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-target/.settings/org.eclipse.jdt.core.prefs?rev=1357656&view=auto
==============================================================================
--- ace/sandbox/marrs/run-target/.settings/org.eclipse.jdt.core.prefs (added)
+++ ace/sandbox/marrs/run-target/.settings/org.eclipse.jdt.core.prefs Thu Jul  5 15:01:35
2012
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

Added: ace/sandbox/marrs/run-target/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-target/bnd.bnd?rev=1357656&view=auto
==============================================================================
    (empty)

Added: ace/sandbox/marrs/run-target/build.xml
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-target/build.xml?rev=1357656&view=auto
==============================================================================
--- ace/sandbox/marrs/run-target/build.xml (added)
+++ ace/sandbox/marrs/run-target/build.xml Thu Jul  5 15:01:35 2012
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="build"> 
+	<import file="../cnf/build.xml"/>
+</project>

Added: ace/sandbox/marrs/run-target/target.bndrun
URL: http://svn.apache.org/viewvc/ace/sandbox/marrs/run-target/target.bndrun?rev=1357656&view=auto
==============================================================================
--- ace/sandbox/marrs/run-target/target.bndrun (added)
+++ ace/sandbox/marrs/run-target/target.bndrun Thu Jul  5 15:01:35 2012
@@ -0,0 +1,11 @@
+-runfw: org.apache.felix.framework;version='[4,5)'
+-runee: JavaSE-1.6
+-runrequire: bundle:(symbolicname=org.apache.ace.managementagent),\
+	bundle:(symbolicname=org.apache.felix.gogo.command),\
+	bundle:(symbolicname=org.apache.felix.gogo.runtime),\
+	bundle:(symbolicname=org.apache.felix.gogo.shell)
+-runbundles: org.apache.felix.gogo.command;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar;version='[0.12.0,0.12.1)',\
+	org.apache.felix.gogo.runtime;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar;version='[0.10.0,0.10.1)',\
+	org.apache.ace.managementagent;resolution=file:/Users/marcel/dev/ace-bndtools/org.apache.ace.managementagent/generated/org.apache.ace.managementagent.jar;version=latest,\
+	org.apache.felix.gogo.shell;resolution=http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar;version='[0.10.0,0.10.1)'
+-runvm: -Dlog=true
\ No newline at end of file



Mime
View raw message