[jboss-osgi-commits] JBoss-OSGI SVN: r103033 - in projects/jboss-osgi: projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading and 2 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Fri Mar 26 07:28:13 EDT 2010
Author: thomas.diesler at jboss.com
Date: 2010-03-26 07:28:12 -0400 (Fri, 26 Mar 2010)
New Revision: 103033
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
Log:
Add shrinkwrap-api to runtime/lib
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-26 11:22:14 UTC (rev 103032)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-03-26 11:28:12 UTC (rev 103033)
@@ -185,8 +185,7 @@
</Private-Package>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
- junit;inline=false,
- shrinkwrap-api;inline=false,
+ junit;inline=false
</Embed-Dependency>
<_exportcontents>
org.junit;version=${version.junit}
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java 2010-03-26 11:22:14 UTC (rev 103032)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/classloading/OSGiCoreClassFilter.java 2010-03-26 11:28:12 UTC (rev 103033)
@@ -55,6 +55,7 @@
"org.osgi.service.packageadmin",
"org.osgi.service.permissionadmin",
"org.osgi.service.startlevel",
+ "org.osgi.service.tracker",
"org.osgi.service.url"
};
}
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-26 11:22:14 UTC (rev 103032)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-26 11:28:12 UTC (rev 103033)
@@ -144,7 +144,7 @@
/**
* Delegates to {@link OSGiTestHelper#getInitialContext()}
*/
- public InitialContext getInitialContext() throws NamingException
+ protected InitialContext getInitialContext() throws NamingException
{
return getTestHelper().getInitialContext();
}
@@ -152,7 +152,7 @@
/**
* Delegates to {@link OSGiTestHelper#getServerHost()}
*/
- public String getServerHost()
+ protected String getServerHost()
{
return getTestHelper().getServerHost();
}
@@ -160,7 +160,7 @@
/**
* Delegates to {@link OSGiTestHelper#getTargetContainer()}
*/
- public String getTargetContainer()
+ protected String getTargetContainer()
{
return getTestHelper().getTargetContainer();
}
@@ -168,7 +168,7 @@
/**
* Delegates to {@link OSGiTestHelper#getFrameworkName()}
*/
- public String getFrameworkName()
+ protected String getFrameworkName()
{
return getTestHelper().getFrameworkName();
}
@@ -176,28 +176,31 @@
/**
* Delegates to {@link OSGiTestHelper#assembleArchive(String, String, Class...)}
*/
- public Archive<?> assembleArchive(String name, String resource, Class<?>... packages) throws Exception
+ protected Archive<?> assembleArchive(String name, String resource, Class<?>... packages) throws Exception
{
return getTestHelper().assembleArchive(name, resource, packages);
}
- public VirtualFile toVirtualFile(Archive<?> archive) throws IOException, MalformedURLException
- {
- return OSGiTestHelper.toVirtualFile(archive);
- }
-
/**
* Delegates to {@link OSGiTestHelper#assembleArchive(String, String[], Class...)}
*/
- public Archive<?> assembleArchive(String name, String[] resources, Class<?>... packages) throws Exception
+ protected Archive<?> assembleArchive(String name, String[] resources, Class<?>... packages) throws Exception
{
return getTestHelper().assembleArchive(name, resources, packages);
}
/**
+ * Delegates to {@link OSGiTestHelper#toVirtualFile(Archive)}
+ */
+ protected VirtualFile toVirtualFile(Archive<?> archive) throws IOException, MalformedURLException
+ {
+ return OSGiTestHelper.toVirtualFile(archive);
+ }
+
+ /**
* Delegates to {@link OSGiTestHelper#assertBundleState(int, int)}
*/
- public void assertBundleState(int expState, int wasState)
+ protected void assertBundleState(int expState, int wasState)
{
getTestHelper().assertBundleState(expState, wasState);
}
@@ -205,7 +208,7 @@
/**
* Delegates to {@link OSGiTestHelper#assertLoadClass(Bundle, String)}
*/
- public Class<?> assertLoadClass(Bundle bundle, String className)
+ protected Class<?> assertLoadClass(Bundle bundle, String className)
{
return getTestHelper().assertLoadClass(bundle, className);
}
@@ -213,7 +216,7 @@
/**
* Delegates to {@link OSGiTestHelper#assertLoadClassFail(Bundle, String)}
*/
- public void assertLoadClassFail(Bundle bundle, String className)
+ protected void assertLoadClassFail(Bundle bundle, String className)
{
getTestHelper().assertLoadClassFail(bundle, className);
}
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-26 11:22:14 UTC (rev 103032)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-26 11:28:12 UTC (rev 103033)
@@ -192,6 +192,7 @@
<include name="jboss-osgi-vfs30.jar" />
<include name="jboss-vfs.jar" />
<include name="log4j.jar" />
+ <include name="shrinkwrap-api.jar" />
<include name="slf4j-api.jar" />
<include name="slf4j-log4j12.jar" />
</fileset>
@@ -311,7 +312,7 @@
<include name="pax-web-extender-war.jar" />
</fileset>
- <!-- JBossMC Integration -->
+ <!-- Native Integration -->
<singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml"
override="true" />
@@ -354,6 +355,7 @@
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="org.osgi.core.jar" />
+ <include name="org.osgi.compendium.jar" /> <!-- Used for org.osgi.service.tracker delegation -->
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
<include name="org.osgi.compendium.jar" />
@@ -406,6 +408,7 @@
<include name="jboss-osgi-jbossas.jar" />
<include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-vfs.jar" />
+ <include name="shrinkwrap-api.jar" />
</fileset>
<fileset condition="!isJBoss601" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-deployers-vfs21.jar" />
@@ -475,7 +478,7 @@
<include name="pax-web-extender-war.jar" />
</fileset>
- <!-- JBossMC Integration -->
+ <!-- Native Integration -->
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
@@ -496,6 +499,7 @@
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
<include name="org.osgi.core.jar" />
+ <include name="org.osgi.compendium.jar" /> <!-- Used for org.osgi.service.tracker delegation -->
</fileset>
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
override="true">
More information about the jboss-osgi-commits
mailing list