JBoss-OSGI SVN: r101814 - in projects/jboss-osgi/trunk: testsuite and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-04 06:11:24 -0500 (Thu, 04 Mar 2010)
New Revision: 101814
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Switch embedded felix/equinox to vfs30
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-04 11:09:02 UTC (rev 101813)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-04 11:11:24 UTC (rev 101814)
@@ -411,8 +411,13 @@
<include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-testing.jar" />
<include name="jboss-osgi-vfs.jar" />
+ </fileset>
+ <fileset condition="!isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-vfs21.jar" />
</fileset>
+ <fileset condition="isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+ <include name="jboss-osgi-vfs30.jar" />
+ </fileset>
<!-- deploy/osgi -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 11:09:02 UTC (rev 101813)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 11:11:24 UTC (rev 101814)
@@ -59,10 +59,6 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- </dependency>
<!-- Apache Aries Dependencies -->
<dependency>
@@ -287,6 +283,10 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-equinox</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -310,6 +310,10 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-felix</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -330,6 +334,10 @@
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ </dependency>
</dependencies>
</profile>
<profile>
@@ -344,6 +352,10 @@
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ </dependency>
</dependencies>
</profile>
@@ -392,6 +404,8 @@
<properties>
<target.container.excludes>org/jboss/test/osgi/jbossas/**</target.container.excludes>
</properties>
+ <dependencies>
+ </dependencies>
</profile>
<!--
14 years, 7 months
JBoss-OSGI SVN: r101812 - in projects/jboss-osgi/projects/vfs/trunk: vfs21/src/main/java/org/jboss/osgi/vfs21 and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-04 05:56:59 -0500 (Thu, 04 Mar 2010)
New Revision: 101812
Modified:
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VFSUtils.java
projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VirtualFile.java
projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VirtualFileAdaptor21.java
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java
Log:
Add close() and vfs30 autmount
Modified: projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VFSUtils.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VFSUtils.java 2010-03-04 10:55:32 UTC (rev 101811)
+++ projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VFSUtils.java 2010-03-04 10:56:59 UTC (rev 101812)
@@ -42,9 +42,7 @@
VirtualFile manifest = archive.getChild(JarFile.MANIFEST_NAME);
if (manifest == null)
- {
return null;
- }
InputStream stream = manifest.openStream();
try
Modified: projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VirtualFile.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VirtualFile.java 2010-03-04 10:55:32 UTC (rev 101811)
+++ projects/jboss-osgi/projects/vfs/trunk/api/src/main/java/org/jboss/osgi/vfs/VirtualFile.java 2010-03-04 10:56:59 UTC (rev 101812)
@@ -124,4 +124,9 @@
* @throws IllegalStateException if the file is closed
*/
InputStream openStream() throws IOException;
+
+ /**
+ * Close the file resources (stream, etc.)
+ */
+ void close();
}
Modified: projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VirtualFileAdaptor21.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VirtualFileAdaptor21.java 2010-03-04 10:55:32 UTC (rev 101811)
+++ projects/jboss-osgi/projects/vfs/trunk/vfs21/src/main/java/org/jboss/osgi/vfs21/VirtualFileAdaptor21.java 2010-03-04 10:56:59 UTC (rev 101812)
@@ -43,7 +43,7 @@
{
private org.jboss.virtual.VirtualFile delegate;
- public VirtualFileAdaptor21(org.jboss.virtual.VirtualFile delegate)
+ VirtualFileAdaptor21(org.jboss.virtual.VirtualFile delegate)
{
this.delegate = delegate;
}
@@ -73,6 +73,11 @@
return delegate.toURL();
}
+ public void close()
+ {
+ delegate.close();
+ }
+
public VirtualFile getChild(String path) throws IOException
{
org.jboss.virtual.VirtualFile child = delegate.getChild(path);
Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-04 10:55:32 UTC (rev 101811)
+++ projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-04 10:56:59 UTC (rev 101812)
@@ -28,6 +28,7 @@
import org.jboss.osgi.vfs.VFSAdaptor;
import org.jboss.osgi.vfs.VirtualFile;
import org.jboss.osgi.vfs.VirtualFileAssembly;
+import org.jboss.vfs.util.automount.Automounter;
/**
* An adaptor to the jboss-vfs-3.0.x VFS.
@@ -48,6 +49,9 @@
{
throw new IOException(ex);
}
+
+ Automounter.mount(root);
+
return new VirtualFileAdaptor30(root);
}
Modified: projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java
===================================================================
--- projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java 2010-03-04 10:55:32 UTC (rev 101811)
+++ projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VirtualFileAdaptor30.java 2010-03-04 10:56:59 UTC (rev 101812)
@@ -32,6 +32,7 @@
import java.util.List;
import org.jboss.osgi.vfs.VirtualFile;
+import org.jboss.vfs.util.automount.Automounter;
/**
* An adaptor to the jboss-vfs-3.0.x VirtualFile.
@@ -42,8 +43,8 @@
class VirtualFileAdaptor30 implements VirtualFile
{
private org.jboss.vfs.VirtualFile delegate;
-
- public VirtualFileAdaptor30(org.jboss.vfs.VirtualFile delegate)
+
+ VirtualFileAdaptor30(org.jboss.vfs.VirtualFile delegate)
{
this.delegate = delegate;
}
@@ -52,12 +53,12 @@
{
return delegate;
}
-
+
public String getName()
{
return delegate.getName();
}
-
+
public String getPathName()
{
return delegate.getPathName();
@@ -78,7 +79,7 @@
org.jboss.vfs.VirtualFile child = delegate.getChild(path);
if (child == null)
return null;
-
+
return new VirtualFileAdaptor30(child);
}
@@ -87,7 +88,7 @@
List<VirtualFile> files = new ArrayList<VirtualFile>();
for (org.jboss.vfs.VirtualFile child : delegate.getChildrenRecursively())
files.add(new VirtualFileAdaptor30(child));
-
+
return Collections.unmodifiableList(files);
}
@@ -105,5 +106,10 @@
{
return delegate.openStream();
}
+
+ public void close()
+ {
+ if (Automounter.isMounted(delegate))
+ Automounter.cleanup(delegate);
+ }
}
-
14 years, 7 months
JBoss-OSGI SVN: r101809 - projects/jboss-osgi/trunk/testsuite.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-04 04:13:41 -0500 (Thu, 04 Mar 2010)
New Revision: 101809
Modified:
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Use vfs21 for all test clients
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 08:30:59 UTC (rev 101808)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 09:13:41 UTC (rev 101809)
@@ -59,6 +59,10 @@
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-deployment</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ </dependency>
<!-- Apache Aries Dependencies -->
<dependency>
@@ -240,11 +244,6 @@
<artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
14 years, 7 months
JBoss-OSGI SVN: r101808 - projects/jboss-osgi/trunk/testsuite.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-04 03:30:59 -0500 (Thu, 04 Mar 2010)
New Revision: 101808
Modified:
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Fix embedded build for felix/equinox
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 07:57:36 UTC (rev 101807)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-04 08:30:59 UTC (rev 101808)
@@ -240,6 +240,11 @@
<artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
14 years, 7 months
JBoss-OSGI SVN: r101807 - projects/jboss-osgi/trunk/distribution/javadoc/scripts.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-04 02:57:36 -0500 (Thu, 04 Mar 2010)
New Revision: 101807
Modified:
projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
Log:
Add jboss-osgi-vfs
Modified: projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2010-03-04 07:42:17 UTC (rev 101806)
+++ projects/jboss-osgi/trunk/distribution/javadoc/scripts/assembly-javadoc-src.xml 2010-03-04 07:57:36 UTC (rev 101807)
@@ -24,6 +24,7 @@
<include>*:jboss-osgi-jta:jar:sources</include>
<include>*:jboss-osgi-spi:jar:sources</include>
<include>*:jboss-osgi-testing:jar:sources</include>
+ <include>*:jboss-osgi-vfs:jar:sources</include>
<include>*:jboss-osgi-webapp:jar:sources</include>
<include>*:jboss-osgi-xml-binding:jar:sources</include>
</includes>
14 years, 7 months
JBoss-OSGI SVN: r101806 - in projects/jboss-osgi/projects/runtime/framework/trunk: bundle/.settings and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-04 02:42:17 -0500 (Thu, 04 Mar 2010)
New Revision: 101806
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.classpath
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java
projects/jboss-osgi/projects/runtime/framework/trunk/core/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.classpath
projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.classpath
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs
Log:
Update eclipse framework build to jdk1.6
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.classpath 2010-03-04 06:45:53 UTC (rev 101805)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.classpath 2010-03-04 07:42:17 UTC (rev 101806)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.settings/org.eclipse.jdt.core.prefs 2010-03-04 06:45:53 UTC (rev 101805)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/.settings/org.eclipse.jdt.core.prefs 2010-03-04 07:42:17 UTC (rev 101806)
@@ -1,6 +1,13 @@
-#Wed Mar 03 11:00:13 CET 2010
+#Thu Mar 04 08:40:54 CET 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java 2010-03-04 06:45:53 UTC (rev 101805)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java 2010-03-04 07:42:17 UTC (rev 101806)
@@ -107,6 +107,7 @@
super.undeploy();
}
+ @SuppressWarnings("unchecked")
protected void deployBundles() throws Exception
{
try
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/.settings/org.eclipse.jdt.core.prefs 2010-03-04 06:45:53 UTC (rev 101805)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/.settings/org.eclipse.jdt.core.prefs 2010-03-04 07:42:17 UTC (rev 101806)
@@ -1,6 +1,13 @@
-#Wed Mar 03 11:00:13 CET 2010
+#Thu Mar 04 08:40:46 CET 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.classpath 2010-03-04 06:45:53 UTC (rev 101805)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.classpath 2010-03-04 07:42:17 UTC (rev 101806)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.settings/org.eclipse.jdt.core.prefs 2010-03-04 06:45:53 UTC (rev 101805)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/metadata/.settings/org.eclipse.jdt.core.prefs 2010-03-04 07:42:17 UTC (rev 101806)
@@ -1,6 +1,13 @@
-#Wed Mar 03 11:00:13 CET 2010
+#Thu Mar 04 08:40:37 CET 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.classpath
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.classpath 2010-03-04 06:45:53 UTC (rev 101805)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.classpath 2010-03-04 07:42:17 UTC (rev 101806)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-04 06:45:53 UTC (rev 101805)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/.settings/org.eclipse.jdt.core.prefs 2010-03-04 07:42:17 UTC (rev 101806)
@@ -1,6 +1,13 @@
-#Wed Mar 03 11:00:13 CET 2010
+#Thu Mar 04 08:40:26 CET 2010
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+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.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
14 years, 7 months
JBoss-OSGI SVN: r101790 - in projects/jboss-osgi/trunk: distribution and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-03 15:00:34 -0500 (Wed, 03 Mar 2010)
New Revision: 101790
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/distribution/pom.xml
projects/jboss-osgi/trunk/pom.xml
Log:
Use VFS abstration in remote runtimes
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -140,6 +140,8 @@
<include name="jboss-osgi-deployment-sources.jar" />
<include name="jboss-osgi-deployers-sources.jar" />
<include name="jboss-osgi-framework-sources.jar" />
+ <include name="jboss-osgi-framework-core-sources.jar" />
+ <include name="jboss-osgi-framework-metadata-sources.jar" />
<include name="jboss-osgi-hotdeploy-sources.jar" />
<include name="jboss-osgi-husky-harness-sources.jar" />
<include name="jboss-osgi-jaxb-sources.jar" />
@@ -189,6 +191,8 @@
<include name="jboss-osgi-deployment.jar" />
<include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-testing.jar" />
+ <include name="jboss-osgi-vfs.jar" />
+ <include name="jboss-osgi-vfs21.jar" />
<include name="jboss-vfs.jar" />
<include name="log4j.jar" />
<include name="slf4j-api.jar" />
@@ -343,6 +347,9 @@
<include name="jboss-metatype.jar" />
<include name="jboss-osgi-deployers.jar" />
<include name="jboss-osgi-framework.jar" />
+ <include name="jboss-osgi-framework-core.jar" />
+ <include name="jboss-osgi-framework-metadata.jar" />
+ <include name="jboss-osgi-framework-vfs21.jar" />
<include name="jboss-reflect.jar" />
<include name="jbossxb.jar" />
<include name="mcann-core.jar" />
@@ -403,6 +410,8 @@
<include name="jboss-osgi-jbossas.jar" />
<include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-testing.jar" />
+ <include name="jboss-osgi-vfs.jar" />
+ <include name="jboss-osgi-vfs21.jar" />
</fileset>
<!-- deploy/osgi -->
@@ -469,6 +478,9 @@
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
<include name="jboss-osgi-framework.jar" />
+ <include name="jboss-osgi-framework-core.jar" />
+ <include name="jboss-osgi-framework-metadata.jar" />
+ <include name="jboss-osgi-framework-vfs21.jar" />
</fileset>
<singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
override="true" />
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -54,6 +54,7 @@
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0,
<!-- org.osgi -->
org.osgi.framework;version=1.5
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -54,6 +54,7 @@
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0,
<!-- org.osgi -->
org.osgi.framework;version=1.5
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -42,7 +42,8 @@
org.jboss.osgi.spi.framework;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
- org.jboss.osgi.testing;version=1.0
+ org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0
</value></entry>
<!-- Husky socket connector properties -->
<entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-03-03 20:00:34 UTC (rev 101790)
@@ -30,6 +30,7 @@
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
org.jboss.osgi.testing;version=1.0, \
+ org.jboss.osgi.vfs;version=1.0, \
org.jboss.virtual;version=2.1, \
org.jboss.virtual.plugins.registry;version=2.1, \
org.jboss.virtual.plugins.context.jar;version=2.1, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-03-03 20:00:34 UTC (rev 101790)
@@ -30,6 +30,7 @@
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
org.jboss.osgi.testing;version=1.0, \
+ org.jboss.osgi.vfs;version=1.0, \
org.jboss.virtual;version=2.1, \
org.jboss.virtual.plugins.registry;version=2.1, \
org.jboss.virtual.plugins.context.jar;version=2.1, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -40,7 +40,8 @@
org.jboss.osgi.spi.framework;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
- org.jboss.osgi.testing;version=1.0
+ org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0
</value></entry>
<!-- Hot Deployment -->
<entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -88,6 +88,42 @@
<classifier>javadoc</classifier>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.testsuite</groupId>
<artifactId>jboss-osgi-testsuite-example</artifactId>
<version>${version}</version>
@@ -452,15 +488,32 @@
<!-- JBossMC Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-vfs21</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
<version>${version.jboss.osgi.framework}</version>
<classifier>sources</classifier>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ <classifier>sources</classifier>
+ </dependency>
<!-- izpack -->
<dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -75,6 +75,7 @@
<version.jboss.osgi.serviceloader>1.0.1-SNAPSHOT</version.jboss.osgi.serviceloader>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
+ <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs>
<version.jboss.osgi.webapp>0.7.2.SP2-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.2.Beta4-SP1-SNAPSHOT</version.jboss.osgi.xml.binding>
@@ -130,6 +131,21 @@
<artifactId>jboss-osgi-testing</artifactId>
<version>${version.jboss.osgi.testing}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ </dependency>
<!-- jboss.osgi.bundles -->
<dependency>
14 years, 7 months
JBoss-OSGI SVN: r101785 - in projects/jboss-osgi/projects/runtime/framework/trunk: bundle and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-03 11:50:20 -0500 (Wed, 03 Mar 2010)
New Revision: 101785
Added:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/
Removed:
projects/jboss-osgi/projects/runtime/framework/trunk/testsuite/
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml
Log:
Resurect framework bundle and all build
Copied: projects/jboss-osgi/projects/runtime/framework/trunk/bundle (from rev 101775, projects/jboss-osgi/projects/runtime/framework/trunk/testsuite)
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/testsuite/pom.xml 2010-03-03 14:45:40 UTC (rev 101775)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-03 16:50:20 UTC (rev 101785)
@@ -16,10 +16,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBossOSGi Framework - Testsuite</name>
+ <name>JBossOSGi Framework - Bundle</name>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework-testsuite</artifactId>
- <packaging>jar</packaging>
+ <artifactId>jboss-osgi-framework</artifactId>
+ <packaging>bundle</packaging>
<parent>
<groupId>org.jboss.osgi.framework</groupId>
@@ -198,6 +198,21 @@
</descriptors>
</configuration>
</execution>
+ <execution>
+ <id>all</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>scripts/assembly-all.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-03 16:49:46 UTC (rev 101784)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/pom.xml 2010-03-03 16:50:20 UTC (rev 101785)
@@ -19,7 +19,7 @@
<name>JBossOSGi Framework - Core</name>
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework-core</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<parent>
<groupId>org.jboss.osgi.framework</groupId>
@@ -160,26 +160,6 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.jboss.osgi.framework</Bundle-SymbolicName>
- <Bundle-Name>JBossOSGi Framework</Bundle-Name>
- <Bundle-Version>${version}</Bundle-Version>
- <Export-Package>
- org.osgi.framework;version="1.5",
- org.osgi.framework.launch;version="1.0",
- org.osgi.framework.hooks.service;version="1.0",
- org.osgi.service.packageadmin;version="1.2",
- org.osgi.service.startlevel;version="1.1",
- org.osgi.util.tracker;version="1.4"
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-03 16:49:46 UTC (rev 101784)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-03 16:50:20 UTC (rev 101785)
@@ -70,7 +70,7 @@
<module>core</module>
<module>metadata</module>
<module>vfs21</module>
- <module>testsuite</module>
+ <module>bundle</module>
</modules>
<!-- Dependency Management -->
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-03 16:49:46 UTC (rev 101784)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-03 16:50:20 UTC (rev 101785)
@@ -29,20 +29,19 @@
<!-- Properties -->
<properties>
- <version.jboss.vfs>2.1.3.SP1</version.jboss.vfs>
</properties>
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi.framework</groupId>
- <artifactId>jboss-osgi-framework</artifactId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
</dependency>
</dependencies>
14 years, 7 months
JBoss-OSGI SVN: r101784 - in projects/jboss-osgi/trunk: testsuite and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-03 11:49:46 -0500 (Wed, 03 Mar 2010)
New Revision: 101784
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Resurect framework bundle and all build
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-03 16:48:39 UTC (rev 101783)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-03 16:49:46 UTC (rev 101784)
@@ -271,7 +271,7 @@
<!-- JBossMC Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
<version>${version.jboss.osgi.framework}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-03-03 16:48:39 UTC (rev 101783)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2010-03-03 16:49:46 UTC (rev 101784)
@@ -49,10 +49,6 @@
<version>${version.jboss.aop.mc.int}</version>
<exclusions>
<exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</exclusion>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-03 16:48:39 UTC (rev 101783)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-03 16:49:46 UTC (rev 101784)
@@ -323,7 +323,7 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
</dependencies>
@@ -337,7 +337,7 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
</dependencies>
14 years, 7 months
JBoss-OSGI SVN: r101782 - projects/jboss-osgi/projects/bundles/husky/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2010-03-03 11:33:03 -0500 (Wed, 03 Mar 2010)
New Revision: 101782
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
Log:
Use VFS abstration in jboss-osgi-husky
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-03 16:28:24 UTC (rev 101781)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-03 16:33:03 UTC (rev 101782)
@@ -43,10 +43,11 @@
<version.apache.aries.jmx>1.0.0-incubating-SNAPSHOT</version.apache.aries.jmx>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.jboss.osgi.common>1.0.4-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.felix>
<version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
- <version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
- <version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
+ <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -130,7 +131,7 @@
<dependency>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version.jboss.osgi.runtime.felix}</version>
+ <version>${version.jboss.osgi.felix}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -140,6 +141,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
@@ -163,7 +170,6 @@
javax.naming,
org.jboss.logging;version="[2.1,3.0)",
- org.jboss.virtual;version="[2.1,3.0)",
org.junit;version="[4.6,5.0)",
org.jboss.osgi.deployment*;version="[1.0,2.0)",
14 years, 7 months