JBoss-OSGI SVN: r89374 - projects/jboss-osgi/projects/bundles/blueprint/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 09:01:30 -0400 (Mon, 25 May 2009)
New Revision: 89374
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
Log:
Revert to jbossxb-2.0.0
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-05-25 13:00:25 UTC (rev 89373)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-05-25 13:01:30 UTC (rev 89374)
@@ -31,7 +31,7 @@
<version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle>
- <version.jbossxb.bundle>2.0.1-SNAPSHOT</version.jbossxb.bundle>
+ <version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle>
<version.osgi>r4v41</version.osgi>
</properties>
17 years, 2 months
JBoss-OSGI SVN: r89373 - projects/jboss-osgi/projects/bundles/jbossxb/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 09:00:25 -0400 (Mon, 25 May 2009)
New Revision: 89373
Modified:
projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
Log:
Revert back to jbossxb-2.0.0. Export jboss-reflect.
Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 12:46:09 UTC (rev 89372)
+++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 13:00:25 UTC (rev 89373)
@@ -7,7 +7,7 @@
<artifactId>jbossxb-bundle</artifactId>
<packaging>bundle</packaging>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -17,9 +17,12 @@
<properties>
<version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.xb>2.0.1.GA</version.jboss.xb>
+ <version.jboss.xb>2.0.0.GA</version.jboss.xb>
<version.javassist>3.9.0.GA</version.javassist>
<version.osgi>r4v41</version.osgi>
+
+ <!-- Transitive Dependencies -->
+ <version.jboss.reflect>2.0.0.GA</version.jboss.reflect>
</properties>
<dependencies>
@@ -92,8 +95,13 @@
jboss-reflect;inline=false,
</Embed-Dependency>
<_exportcontents>
- org.jboss.xb.binding*;version=${version.jboss.xb},
- javassist;version=${version.javassist},
+ org.jboss.beans.info.*;version=${version.jboss.reflect},
+ org.jboss.config.*;version=${version.jboss.reflect},
+ org.jboss.classadapter.*;version=${version.jboss.reflect},
+ org.jboss.joinpoint.*;version=${version.jboss.reflect},
+ org.jboss.reflect*;version=${version.jboss.reflect},
+ org.jboss.xb.*;version=${version.jboss.xb},
+ javassist*;version=${version.javassist},
</_exportcontents>
</instructions>
</configuration>
17 years, 2 months
JBoss-OSGI SVN: r89371 - projects/jboss-osgi/projects/bundles/jbossxb/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 08:43:01 -0400 (Mon, 25 May 2009)
New Revision: 89371
Modified:
projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
Log:
Export javassist
Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 12:27:01 UTC (rev 89370)
+++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 12:43:01 UTC (rev 89371)
@@ -18,7 +18,7 @@
<properties>
<version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.xb>2.0.1.GA</version.jboss.xb>
- <version.javasisst>3.9.0.GA</version.javasisst>
+ <version.javassist>3.9.0.GA</version.javassist>
<version.osgi>r4v41</version.osgi>
</properties>
@@ -31,7 +31,7 @@
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
- <version>${version.javasisst}</version>
+ <version>${version.javassist}</version>
</dependency>
<!-- Provided Dependencies -->
@@ -93,7 +93,7 @@
</Embed-Dependency>
<_exportcontents>
org.jboss.xb.binding*;version=${version.jboss.xb},
- javasisst;version=${version.javasisst},
+ javassist;version=${version.javassist},
</_exportcontents>
</instructions>
</configuration>
17 years, 2 months
JBoss-OSGI SVN: r89370 - projects/jboss-osgi/projects/bundles/jbossxb/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 08:27:01 -0400 (Mon, 25 May 2009)
New Revision: 89370
Modified:
projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
Log:
Export javassisst
Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 12:09:45 UTC (rev 89369)
+++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 12:27:01 UTC (rev 89370)
@@ -92,7 +92,8 @@
jboss-reflect;inline=false,
</Embed-Dependency>
<_exportcontents>
- org.jboss.xb.binding*;version=${version.jboss.xb}
+ org.jboss.xb.binding*;version=${version.jboss.xb},
+ javasisst;version=${version.javasisst},
</_exportcontents>
</instructions>
</configuration>
17 years, 2 months
JBoss-OSGI SVN: r89368 - in projects/jboss-osgi/projects: .settings and 7 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 08:05:42 -0400 (Mon, 25 May 2009)
New Revision: 89368
Added:
projects/jboss-osgi/projects/.settings/
projects/jboss-osgi/projects/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/jboss-osgi/projects/bundles/.project
projects/jboss-osgi/projects/bundles/jaxb/trunk/.classpath
projects/jboss-osgi/projects/bundles/jaxb/trunk/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.classpath
projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/husky/trunk/harness/
projects/jboss-osgi/projects/husky/trunk/testsuite/
Log:
Various eclipse project setup
Added: projects/jboss-osgi/projects/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/jboss-osgi/projects/.settings/org.eclipse.jdt.core.prefs 2009-05-25 12:05:42 UTC (rev 89368)
@@ -0,0 +1,5 @@
+#Mon May 25 10:37:03 CEST 2009
+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.source=1.5
Added: projects/jboss-osgi/projects/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/projects/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/projects/.settings/org.maven.ide.eclipse.prefs 2009-05-25 12:05:42 UTC (rev 89368)
@@ -0,0 +1,9 @@
+#Mon May 25 10:36:25 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/projects/bundles/.project
===================================================================
--- projects/jboss-osgi/projects/bundles/.project 2009-05-25 12:05:32 UTC (rev 89367)
+++ projects/jboss-osgi/projects/bundles/.project 2009-05-25 12:05:42 UTC (rev 89368)
@@ -6,23 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
Modified: projects/jboss-osgi/projects/bundles/jaxb/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jaxb/trunk/.classpath 2009-05-25 12:05:32 UTC (rev 89367)
+++ projects/jboss-osgi/projects/bundles/jaxb/trunk/.classpath 2009-05-25 12:05:42 UTC (rev 89368)
@@ -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"/>
+ <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="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/bundles/jaxb/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jaxb/trunk/.settings/org.eclipse.jdt.core.prefs 2009-05-25 12:05:32 UTC (rev 89367)
+++ projects/jboss-osgi/projects/bundles/jaxb/trunk/.settings/org.eclipse.jdt.core.prefs 2009-05-25 12:05:42 UTC (rev 89368)
@@ -1,5 +1,5 @@
-#Wed Apr 29 11:59:13 CEST 2009
+#Mon May 25 10:37:00 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.classpath 2009-05-25 12:05:32 UTC (rev 89367)
+++ projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.classpath 2009-05-25 12:05:42 UTC (rev 89368)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <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="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.settings/org.eclipse.jdt.core.prefs 2009-05-25 12:05:32 UTC (rev 89367)
+++ projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/.settings/org.eclipse.jdt.core.prefs 2009-05-25 12:05:42 UTC (rev 89368)
@@ -1,5 +1,5 @@
-#Tue May 19 18:04:23 CEST 2009
+#Mon May 25 10:37:00 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: projects/jboss-osgi/projects/husky/trunk/harness
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: projects/jboss-osgi/projects/husky/trunk/testsuite
___________________________________________________________________
Name: svn:ignore
+ target
17 years, 2 months
JBoss-OSGI SVN: r89366 - in projects/jboss-osgi/projects/bundles/jbossxb/trunk: src/main/java/org/jboss/osgi/jbossxb/internal and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 08:04:57 -0400 (Mon, 25 May 2009)
New Revision: 89366
Modified:
projects/jboss-osgi/projects/bundles/jbossxb/trunk/.project
projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
projects/jboss-osgi/projects/bundles/jbossxb/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/Activator.java
Log:
Disable Activator logic
Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/.project
===================================================================
--- projects/jboss-osgi/projects/bundles/jbossxb/trunk/.project 2009-05-25 12:04:29 UTC (rev 89365)
+++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/.project 2009-05-25 12:04:57 UTC (rev 89366)
@@ -6,11 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 12:04:29 UTC (rev 89365)
+++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 12:04:57 UTC (rev 89366)
@@ -16,6 +16,7 @@
</parent>
<properties>
+ <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.xb>2.0.1.GA</version.jboss.xb>
<version.javasisst>3.9.0.GA</version.javasisst>
<version.osgi>r4v41</version.osgi>
@@ -35,11 +36,23 @@
<!-- Provided Dependencies -->
<dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -65,8 +78,10 @@
com.wutka.dtd,
org.apache.xerces.*,
org.jboss.logging,
+ org.jboss.osgi.common.log,
org.jboss.util*,
org.osgi.framework,
+ org.osgi.service.log,
<!-- ignore -->
!com.sun.jdi*
Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/Activator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/jbossxb/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/Activator.java 2009-05-25 12:04:29 UTC (rev 89365)
+++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/src/main/java/org/jboss/osgi/jbossxb/internal/Activator.java 2009-05-25 12:04:57 UTC (rev 89366)
@@ -23,8 +23,10 @@
//$Id$
+import org.jboss.osgi.common.log.LogServiceTracker;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.service.log.LogService;
/**
* [TODO]
@@ -34,11 +36,43 @@
*/
public class Activator implements BundleActivator
{
+ private LogService log;
+
public void start(BundleContext context) throws Exception
{
+ log = new LogServiceTracker(context);
//String parserConfig = System.getProperty(XMLParserConfiguration.class.getName());
//if (parserConfig == null)
// System.setProperty(XMLParserConfiguration.class.getName(), XIncludeAwareParserConfiguration.class.getName());
+
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ ClassLoader bundleCL = getClass().getClassLoader();
+ Thread.currentThread().setContextClassLoader(bundleCL);
+
+// log.log(LogService.LOG_DEBUG, "Initializing jbossxb with: " + bundleCL);
+
+// https://jira.jboss.org/jira/browse/JBXB-201
+// Cannot parse schema/jbxb_1_0.xsd
+
+// Class<?> xsImpl = bundleCL.loadClass(DOMXSImplementationSourceImpl.class.getName());
+// if (xsImpl == null)
+// throw new IllegalStateException("Cannot load: " + DOMXSImplementationSourceImpl.class.getName());
+
+// String jbxbSchema = "schema/jbxb_1_0.xsd";
+// URL jbxbXSD = context.getBundle().getResource(jbxbSchema);
+// if (jbxbXSD == null)
+// throw new IllegalStateException("Cannot find: " + jbxbSchema);
+//
+// XSModel xsModel = Util.loadSchema(jbxbXSD.toExternalForm(), (SchemaBindingResolver)null);
+// if (xsModel == null)
+// throw new IllegalStateException("Cannot load schema: " + jbxbSchema);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(ctxLoader);
+ }
}
public void stop(BundleContext context) throws Exception
17 years, 2 months
JBoss-OSGI SVN: r89365 - in projects/jboss-osgi/projects/bundles/blueprint/trunk: testsuite and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 08:04:29 -0400 (Mon, 25 May 2009)
New Revision: 89365
Added:
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.classpath
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.project
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
Log:
Register BlueprintContext
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-05-25 12:04:08 UTC (rev 89364)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-05-25 12:04:29 UTC (rev 89365)
@@ -31,7 +31,7 @@
<version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
<version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.common.core.bundle>2.2.11-SNAPSHOT</version.jboss.common.core.bundle>
- <version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle>
+ <version.jbossxb.bundle>2.0.1-SNAPSHOT</version.jbossxb.bundle>
<version.osgi>r4v41</version.osgi>
</properties>
Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.classpath (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.classpath 2009-05-25 12:04:29 UTC (rev 89365)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.project
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.project (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.project 2009-05-25 12:04:29 UTC (rev 89365)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-blueprint-testsuite</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.eclipse.jdt.core.prefs 2009-05-25 12:04:29 UTC (rev 89365)
@@ -0,0 +1,5 @@
+#Mon May 25 10:32:34 CEST 2009
+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.source=1.5
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/.settings/org.maven.ide.eclipse.prefs 2009-05-25 12:04:29 UTC (rev 89365)
@@ -0,0 +1,9 @@
+#Mon May 25 10:32:27 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml 2009-05-25 12:04:08 UTC (rev 89364)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml 2009-05-25 12:04:29 UTC (rev 89365)
@@ -150,11 +150,11 @@
<!--
Implement URLStreamHandlerService
https://jira.jboss.org/jira/browse/JBOSGI-75
- -->
<property>
<name>java.protocol.handler.pkgs</name>
<value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
</property>
+ -->
<property>
<name>test.archive.directory</name>
<value>${project.build.directory}/test-libs</value>
Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context (from rev 89261, projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/context)
Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java 2009-05-21 21:58:42 UTC (rev 89261)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java 2009-05-25 12:04:29 UTC (rev 89365)
@@ -24,11 +24,10 @@
//$Id$
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.jboss.osgi.husky.BridgeFactory;
import org.jboss.osgi.husky.annotation.ProvideContext;
-import org.jboss.osgi.spi.testing.HuskyCapability;
-import org.jboss.osgi.spi.testing.JMXCapability;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTestHelper;
import org.junit.After;
@@ -37,6 +36,8 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.blueprint.context.BlueprintContext;
/**
* Blueprint parser tests
@@ -59,8 +60,6 @@
{
helper = new OSGiTestHelper();
runtime = helper.getDefaultRuntime();
- runtime.addCapability(new JMXCapability());
- runtime.addCapability(new HuskyCapability());
runtime.installBundle("context-basic.jar").start();
}
@@ -86,5 +85,8 @@
Bundle bundle = context.getBundle();
assertEquals("context-basic", bundle.getSymbolicName());
+
+ ServiceReference sref = context.getServiceReference(BlueprintContext.class.getName());
+ assertNotNull("BlueprintContext registered", sref);
}
}
\ No newline at end of file
17 years, 2 months
JBoss-OSGI SVN: r89364 - in projects/jboss-osgi/projects/bundles/blueprint/trunk/impl: .settings and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 08:04:08 -0400 (Mon, 25 May 2009)
New Revision: 89364
Added:
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.classpath
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.project
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintExtender.java
projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java
Log:
Register BlueprintContext
Property changes on: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.classpath (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.classpath 2009-05-25 12:04:08 UTC (rev 89364)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/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="output" path="target/classes"/>
+</classpath>
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.project
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.project (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.project 2009-05-25 12:04:08 UTC (rev 89364)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-blueprint-impl</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/org.eclipse.jdt.core.prefs 2009-05-25 12:04:08 UTC (rev 89364)
@@ -0,0 +1,5 @@
+#Mon May 25 10:32:34 CEST 2009
+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.source=1.5
Added: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/.settings/org.maven.ide.eclipse.prefs 2009-05-25 12:04:08 UTC (rev 89364)
@@ -0,0 +1,9 @@
+#Mon May 25 10:32:27 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml 2009-05-25 12:03:30 UTC (rev 89363)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml 2009-05-25 12:04:08 UTC (rev 89364)
@@ -63,6 +63,7 @@
org.osgi.service.blueprint.*
</Export-Package>
<Import-Package>
+ org.apache.xerces.dom,
org.jboss.osgi.spi,
org.jboss.osgi.common.log,
org.jboss.xb.*,
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintExtender.java
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintExtender.java 2009-05-25 12:03:30 UTC (rev 89363)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintExtender.java 2009-05-25 12:04:08 UTC (rev 89364)
@@ -33,7 +33,7 @@
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
-import org.osgi.framework.BundleListener;
+import org.osgi.framework.SynchronousBundleListener;
import org.osgi.service.blueprint.context.BlueprintContext;
import org.osgi.service.log.LogService;
@@ -43,18 +43,17 @@
* @author thomas.diesler(a)jboss.com
* @since 13-May-2009
*/
-public class BlueprintExtender implements BundleListener
+public class BlueprintExtender implements SynchronousBundleListener
{
private static final String HEADER_BUNDLE_BLUEPRINT = "Bundle-Blueprint";
private LogService log;
+ private BundleContext context;
- // A
- // private Map<String, Blueprint> compDefRegistry = new HashMap<String, Blueprint>();
-
public BlueprintExtender(BundleContext context)
{
this.log = new LogServiceTracker(context);
+ this.context = context;
}
@SuppressWarnings("unchecked")
@@ -63,7 +62,7 @@
Bundle bundle = event.getBundle();
Blueprint bpMetadata = null;
- if (event.getType() == BundleEvent.STARTED)
+ if (event.getType() == BundleEvent.STARTING)
{
// If a Bundle-Blueprint manifest header is defined, then this header contains a list of paths.
// If this header is not defined, then resources ending in .xml in the bundle’s
@@ -99,7 +98,7 @@
if (bpMetadata != null)
{
BlueprintContext bpContext = new BlueprintContextImpl(bpMetadata);
- bundle.getBundleContext().registerService(BlueprintContext.class.getName(), bpContext, null);
+ context.registerService(BlueprintContext.class.getName(), bpContext, null);
}
}
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java 2009-05-25 12:03:30 UTC (rev 89363)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/src/main/java/org/jboss/osgi/blueprint/parser/BlueprintParser.java 2009-05-25 12:04:08 UTC (rev 89364)
@@ -25,6 +25,7 @@
import java.net.URL;
+import org.apache.xerces.dom.DOMXSImplementationSourceImpl;
import org.jboss.osgi.blueprint.BlueprintException;
import org.jboss.osgi.blueprint.reflect.Blueprint;
import org.jboss.xb.binding.JBossXBException;
@@ -39,33 +40,61 @@
* @author thomas.diesler(a)jboss.com
* @since 13-May-2009
*/
-public class BlueprintParser
+public class BlueprintParser
{
private static SchemaBinding schemaBinding;
-
+
public BlueprintParser()
{
if (schemaBinding == null)
{
- ClassLoader resourceLoader = getClass().getClassLoader();
- URL schemaXSD = resourceLoader.getResource("schema/blueprint-jbxb.xsd");
- if (schemaXSD == null)
- throw new BlueprintException("Cannot get blueprint schema from: " + resourceLoader);
-
- schemaBinding = XsdBinder.bind(schemaXSD.toExternalForm());
+ // https://jira.jboss.org/jira/browse/JBXB-202
+ // Inconsistent initialization of XSImplementation
+ //
+ // Please provide an JBossXB initialization entry point that is public and does not make an assumption on the availability of the TCCL
+ //
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ ClassLoader bundleCL = getClass().getClassLoader();
+ Thread.currentThread().setContextClassLoader(bundleCL);
+
+ // Make sure we import and can load the XSImplementation
+ // This is the code that is used in JBossXB Util.getXSImplementation()
+ bundleCL.loadClass(DOMXSImplementationSourceImpl.class.getName());
+
+ ClassLoader resourceLoader = getClass().getClassLoader();
+ URL schemaXSD = resourceLoader.getResource("schema/blueprint-jbxb.xsd");
+ if (schemaXSD == null)
+ throw new BlueprintException("Cannot get blueprint schema from: " + resourceLoader);
+
+ schemaBinding = XsdBinder.bind(schemaXSD.toExternalForm());
+ }
+ catch (ClassNotFoundException ex)
+ {
+ throw new IllegalStateException("Cannot load: " + DOMXSImplementationSourceImpl.class.getName());
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(ctxLoader);
+ }
}
}
- /**
- * Parse a blueprint descriptor
+ /*
+ * * Parse a blueprint descriptor
*/
- public Blueprint parse(URL xmlURL)
+ public Blueprint parse(URL xmlURL)
{
if (xmlURL == null)
throw new IllegalArgumentException("Cannot parse null descriptor URL");
-
+
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
try
{
+ ClassLoader bundleCL = getClass().getClassLoader();
+ Thread.currentThread().setContextClassLoader(bundleCL);
+
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
return (Blueprint)unmarshaller.unmarshal(xmlURL.toExternalForm(), schemaBinding);
}
@@ -73,5 +102,9 @@
{
throw new BlueprintException("Cannot parse blueprint descriptor: " + xmlURL, ex);
}
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(ctxLoader);
+ }
}
}
\ No newline at end of file
17 years, 2 months
JBoss-OSGI SVN: r89363 - in projects/jboss-osgi/projects/bundles/apache-xerces/trunk: .settings and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 08:03:30 -0400 (Mon, 25 May 2009)
New Revision: 89363
Modified:
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.classpath
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
Log:
Add version info to manifest
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.classpath
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.classpath 2009-05-25 11:57:47 UTC (rev 89362)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.classpath 2009-05-25 12:03:30 UTC (rev 89363)
@@ -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"/>
+ <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="output" path="target/classes"/>
</classpath>
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.settings/org.eclipse.jdt.core.prefs 2009-05-25 11:57:47 UTC (rev 89362)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/.settings/org.eclipse.jdt.core.prefs 2009-05-25 12:03:30 UTC (rev 89363)
@@ -1,5 +1,5 @@
-#Wed Apr 29 11:59:13 CEST 2009
+#Mon May 25 10:37:04 CEST 2009
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Modified: projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-05-25 11:57:47 UTC (rev 89362)
+++ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/pom.xml 2009-05-25 12:03:30 UTC (rev 89363)
@@ -91,7 +91,10 @@
xercesImpl;inline=false,
xml-resolver;inline=false,
</Embed-Dependency>
- <_exportcontents>*</_exportcontents>
+ <_exportcontents>
+ com.wutka.dtd;version=${version.wutka.dtdparser},
+ org.apache.xerces.*;version=${version.apache.xerces},
+ </_exportcontents>
</instructions>
</configuration>
</plugin>
17 years, 2 months
JBoss-OSGI SVN: r89360 - projects/jboss-osgi/projects/bundles/jbossxb/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-25 06:08:23 -0400 (Mon, 25 May 2009)
New Revision: 89360
Modified:
projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
Log:
Update to 2.0.1
Modified: projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 09:57:32 UTC (rev 89359)
+++ projects/jboss-osgi/projects/bundles/jbossxb/trunk/pom.xml 2009-05-25 10:08:23 UTC (rev 89360)
@@ -7,7 +7,7 @@
<artifactId>jbossxb-bundle</artifactId>
<packaging>bundle</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
<parent>
<groupId>org.jboss.osgi.bundles</groupId>
@@ -16,7 +16,7 @@
</parent>
<properties>
- <version.jboss.xb>2.0.0.GA</version.jboss.xb>
+ <version.jboss.xb>2.0.1.GA</version.jboss.xb>
<version.javasisst>3.9.0.GA</version.javasisst>
<version.osgi>r4v41</version.osgi>
</properties>
17 years, 2 months