JBoss-OSGI SVN: r94508 - projects/jboss-osgi/projects/bundles.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-08 05:32:43 -0400 (Thu, 08 Oct 2009)
New Revision: 94508
Added:
projects/jboss-osgi/projects/bundles/jboss-xml-binding/
Removed:
projects/jboss-osgi/projects/bundles/xml-binding/
Log:
Add jboss prefix
Copied: projects/jboss-osgi/projects/bundles/jboss-xml-binding (from rev 94507, projects/jboss-osgi/projects/bundles/xml-binding)
16 years, 2 months
JBoss-OSGI SVN: r94507 - in projects/jboss-osgi/trunk/hudson: hudson-home and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-08 04:25:32 -0400 (Thu, 08 Oct 2009)
New Revision: 94507
Modified:
projects/jboss-osgi/trunk/hudson/build.xml
projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
Log:
Simplify hudson setup
Modified: projects/jboss-osgi/trunk/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/build.xml 2009-10-08 07:24:07 UTC (rev 94506)
+++ projects/jboss-osgi/trunk/hudson/build.xml 2009-10-08 08:25:32 UTC (rev 94507)
@@ -21,17 +21,18 @@
<!-- Hudson Jobs -->
<!-- ================================================================== -->
<macrodef name="copyjobs">
- <sequential>
- <copyjob index="0" prefix="" job="JBoss-5.2.0"/>
- <copyjob index="1" prefix="" job="JBoss-6.0.0"/>
- <copyjob index="2" prefix="${hudson.job.prefix}" job="jbossosgi-embedded"/>
- <copyjob index="3" prefix="${hudson.job.prefix}" job="jbossosgi-jdk15"/>
- <copyjob index="4" prefix="${hudson.job.prefix}" job="jbossosgi-jdk16"/>
- <copyjob index="5" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-embedded"/>
- <copyjob index="6" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-equinox"/>
- <copyjob index="7" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-felix"/>
- <copyjob index="8" prefix="${hudson.job.prefix}" job="jbossosgi-matrix-jbossmc"/>
- </sequential>
+ <sequential>
+ <copy todir="${hudson.home}/jobs" overwrite="true">
+ <fileset dir="${hudson.dir}/hudson-home/jobs">
+ <include name="*/config.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="hudson.osgi.url" value="${hudson.osgi.url}"/>
+ <filter token="version.id" value="${version.id}"/>
+ <filtersfile file="${hudson.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ </sequential>
</macrodef>
<!-- ================================================================== -->
@@ -47,9 +48,6 @@
<xmlproperty file="${project.root.dir}/pom.xml"/>
<property name="version.id" value="${project.version}"/>
- <property name="hudson.job.prefix" value="V${project.version}"/>
-
- <echo message="${hudson.job.prefix}"/>
</target>
<target name="init-hudson" depends="init">
@@ -162,7 +160,6 @@
</fileset>
<filterset>
<filter token="version.id" value="${version.id}"/>
- <filter token="hudson.job.prefix" value="${hudson.job.prefix}"/>
<filtersfile file="${hudson.dir}/ant.properties"/>
</filterset>
</copy>
@@ -213,30 +210,4 @@
</target>
- <macrodef name="copyjob">
- <attribute name="index"/>
- <attribute name="prefix"/>
- <attribute name="job"/>
- <sequential>
- <condition property="job.prefix.@{index}" value="@{prefix}-" else="">
- <and>
- <available file="${hudson.home}/jobs/@{job}" type="dir"/>
- <not>
- <equals arg1="@{prefix}" arg2=""/>
- </not>
- </and>
- </condition>
- <copy todir="${hudson.home}/jobs/${job.prefix.@{index}}@{job}" overwrite="true">
- <fileset dir="${hudson.dir}/hudson-home/jobs/@{job}">
- <include name="config.xml"/>
- </fileset>
- <filterset>
- <filter token="hudson.osgi.url" value="${hudson.osgi.url}"/>
- <filter token="version.id" value="${version.id}"/>
- <filtersfile file="${hudson.dir}/ant.properties"/>
- </filterset>
- </copy>
- </sequential>
- </macrodef>
-
</project>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/config.xml 2009-10-08 07:24:07 UTC (rev 94506)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/config.xml 2009-10-08 08:25:32 UTC (rev 94507)
@@ -35,14 +35,6 @@
<owner class="hudson" reference="../../.."/>
<name>All</name>
</hudson.model.AllView>
- <listView>
- <owner class="hudson" reference="../../.."/>
- <name>V(a)version.id@</name>
- <jobNames class="tree-set">
- <comparator class="hudson.util.CaseInsensitiveComparator"/>
- </jobNames>
- <includeRegex>@hudson.job.prefix(a)-(.*)</includeRegex>
- </listView>
</views>
<primaryView>All</primaryView>
<slaveAgentPort>0</slaveAgentPort>
16 years, 2 months
JBoss-OSGI SVN: r94506 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-08 03:24:07 -0400 (Thu, 08 Oct 2009)
New Revision: 94506
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
Log:
Fix equinox AS integration
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 2009-10-08 06:38:34 UTC (rev 94505)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-10-08 07:24:07 UTC (rev 94506)
@@ -24,12 +24,8 @@
<entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry>
<entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
<entry>
- <key>org.osgi.framework.system.packages</key>
+ <key>org.osgi.framework.system.packages.extra</key>
<value>
- <!-- system -->
- javax.management,
- javax.xml.parsers,
- org.xml.sax,
<!-- log4j -->
org.apache.log4j;version=1.2,
@@ -41,7 +37,7 @@
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.testing;version=1.0,
- org.jboss.osgi.spi.util;version=1.0,
+ org.jboss.osgi.spi.util;version=1.0,
<!-- jboss -->
org.jboss.logging
16 years, 2 months
JBoss-OSGI SVN: r94502 - in projects/jboss-osgi/trunk: testsuite/example/src/test/java/org/jboss/test/osgi/example/http and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-08 02:15:25 -0400 (Thu, 08 Oct 2009)
New Revision: 94502
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
Log:
Give WebApp some time to response
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 2009-10-08 05:10:10 UTC (rev 94501)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-08 06:15:25 UTC (rev 94502)
@@ -160,7 +160,7 @@
<property name="bundleManager"><inject bean="OSGiBundleManager" /></property>
</bean>
<bean name="OSGiClassLoaderFactory" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderFactory" >
- <property name="system"><inject bean="OSGiClassLoaderSystem"/></property>
+ <property name="system"><inject bean="ClassLoaderSystem"/></property>
</bean>
<bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.framework.classloading.OSGiBundleClassLoadingDeployer">
<property name="domain"><inject bean="OSGiClassLoaderDomain"/></property>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-10-08 05:10:10 UTC (rev 94501)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-10-08 06:15:25 UTC (rev 94502)
@@ -59,7 +59,7 @@
// Allow 10s for the HttpService to become available
long timeout = 50;
OSGiServiceReference sref = runtime.getServiceReference(HttpService.class.getName());
- while (sref == null && (timeout--) > 0)
+ while (sref == null && 0 < timeout--)
{
Thread.sleep(200);
sref = runtime.getServiceReference(HttpService.class.getName());
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-08 05:10:10 UTC (rev 94501)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-08 06:15:25 UTC (rev 94502)
@@ -21,11 +21,12 @@
*/
package org.jboss.test.osgi.example.webapp;
-//$Id: $
+//$Id:$
import static org.junit.Assert.assertEquals;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
@@ -64,26 +65,47 @@
}
@Test
+ public void testResourceAccess() throws Exception
+ {
+ assertEquals("Hello from Resource", getHttpResponse("/message.txt"));
+ }
+
+ @Test
public void testServletAccess() throws Exception
{
- URL url = new URL("http://" + runtime.getServerHost() + ":8090/example-webapp/servlet?test=plain");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("Hello from Servlet", br.readLine());
+ assertEquals("Hello from Servlet", getHttpResponse("/servlet?test=plain"));
}
@Test
public void testServletInitProps() throws Exception
{
- URL url = new URL("http://" + runtime.getServerHost() + ":8090/example-webapp/servlet?test=initProp");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("initProp=SomeValue", br.readLine());
+ assertEquals("initProp=SomeValue", getHttpResponse("/servlet?test=initProp"));
}
- @Test
- public void testResourceAccess() throws Exception
+ private String getHttpResponse(String reqPath) throws Exception
{
- URL url = new URL("http://" + runtime.getServerHost() + ":8090/example-webapp/message.txt");
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- assertEquals("Hello from Resource", br.readLine());
+ URL url = new URL("http://" + runtime.getServerHost() + ":8090/example-webapp" + reqPath);
+
+ int timeout = 50;
+ String line = null;
+ IOException lastException = null;
+ while (line == null && 0 < timeout--)
+ {
+ try
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
+ line = br.readLine();
+ }
+ catch (IOException ex)
+ {
+ lastException = ex;
+ Thread.sleep(200);
+ }
+ }
+
+ if (line == null && lastException != null)
+ throw lastException;
+
+ return line;
}
}
\ No newline at end of file
16 years, 2 months
JBoss-OSGI SVN: r94501 - projects/jboss-osgi/projects/runtime/microcontainer/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-08 01:10:10 -0400 (Thu, 08 Oct 2009)
New Revision: 94501
Modified:
projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
Log:
update snapshot versions
Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-10-08 05:09:33 UTC (rev 94500)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/pom.xml 2009-10-08 05:10:10 UTC (rev 94501)
@@ -48,7 +48,7 @@
<version.jboss.deployers>2.0.8.GA</version.jboss.deployers>
<version.jboss.logging.log4j>2.1.0.GA</version.jboss.logging.log4j>
<version.jboss.osgi.apache.xerces>2.9.1.SP2</version.jboss.osgi.apache.xerces>
- <version.jboss.osgi.common>1.0.1</version.jboss.osgi.common>
+ <version.jboss.osgi.common>1.0.2-SNAPSHOT</version.jboss.osgi.common>
<version.jboss.osgi.common-core>2.2.13.GA</version.jboss.osgi.common-core>
<version.jboss.osgi.hotdeploy>1.0.1</version.jboss.osgi.hotdeploy>
<version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
@@ -56,7 +56,7 @@
<version.jboss.osgi.jmx>1.0.1</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
<version.jboss.osgi.runtime.deployers>1.0.1</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.spi>1.0.1</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.2-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
<version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
<version.jboss.test>1.1.4.GA</version.jboss.test>
16 years, 2 months
JBoss-OSGI SVN: r94500 - projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-08 01:09:33 -0400 (Thu, 08 Oct 2009)
New Revision: 94500
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java
Log:
more debugging
Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java 2009-10-08 05:08:57 UTC (rev 94499)
+++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/OSGiTestHelper.java 2009-10-08 05:09:33 UTC (rev 94500)
@@ -182,17 +182,20 @@
public String getServerHost()
{
- return System.getProperty("jboss.bind.address", "localhost");
+ String bindAddress = System.getProperty("jboss.bind.address", "localhost");
+ return bindAddress;
}
public String getTargetContainer()
{
- return System.getProperty("target.container");
+ String targetContainer = System.getProperty("target.container");
+ return targetContainer;
}
public String getFramework()
{
- return System.getProperty("framework", "jbossmc");
+ String framework = System.getProperty("framework", "jbossmc");
+ return framework;
}
public boolean isFrameworkEquinox()
16 years, 2 months
JBoss-OSGI SVN: r94499 - in projects/jboss-osgi/trunk: testsuite/example and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-08 01:08:57 -0400 (Thu, 08 Oct 2009)
New Revision: 94499
Added:
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
Fix embedded equinox
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-10-08 04:11:40 UTC (rev 94498)
+++ projects/jboss-osgi/trunk/pom.xml 2009-10-08 05:08:57 UTC (rev 94499)
@@ -332,6 +332,10 @@
<name>test.archive.directory</name>
<value>${project.build.directory}/test-libs</value>
</property>
+ <property>
+ <name>framework</name>
+ <value>${framework}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
@@ -393,6 +397,10 @@
<value>5401</value>
</property>
<property>
+ <name>framework</name>
+ <value>${framework}</value>
+ </property>
+ <property>
<name>target.container</name>
<value>${target.container}</value>
</property>
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-08 04:11:40 UTC (rev 94498)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-08 05:08:57 UTC (rev 94499)
@@ -158,6 +158,26 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compendium</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>directory-single</goal>
+ </goals>
+ <configuration>
+ <finalName>test-libs</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-compendium-equinox.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml 2009-10-08 05:08:57 UTC (rev 94499)
@@ -0,0 +1,25 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <!-- Dependency Sets -->
+ <dependencySets>
+
+ <!-- bundles -->
+ <dependencySet>
+ <outputDirectory>bundles</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.eclipse.equinox:org.eclipse.osgi.services:jar</include>
+ </includes>
+ <useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ </dependencySet>
+
+ </dependencySets>
+</assembly>
Property changes on: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-equinox.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-10-08 04:11:40 UTC (rev 94498)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-10-08 05:08:57 UTC (rev 94499)
@@ -122,6 +122,26 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compendium</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>directory-single</goal>
+ </goals>
+ <configuration>
+ <finalName>test-libs</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-compendium-equinox.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
Added: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml 2009-10-08 05:08:57 UTC (rev 94499)
@@ -0,0 +1,25 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <!-- Dependency Sets -->
+ <dependencySets>
+
+ <!-- bundles -->
+ <dependencySet>
+ <outputDirectory>bundles</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>org.eclipse.equinox:org.eclipse.osgi.services:jar</include>
+ </includes>
+ <useStrictFiltering>false</useStrictFiltering>
+ <scope>provided</scope>
+ <unpack>false</unpack>
+ </dependencySet>
+
+ </dependencySets>
+</assembly>
Property changes on: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-equinox.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 2 months
JBoss-OSGI SVN: r94498 - in projects/jboss-osgi/trunk/testsuite/example: src/test/java/org/jboss/test/osgi/example/webapp and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-08 00:11:40 -0400 (Thu, 08 Oct 2009)
New Revision: 94498
Modified:
projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
Log:
Use example-webapp.jar instead of .war
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-10-08 04:01:40 UTC (rev 94497)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/antrun-test-jars.xml 2009-10-08 04:11:40 UTC (rev 94498)
@@ -62,7 +62,7 @@
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/example-simple-husky.jar" files="${tests.resources.dir}/simple/example-simple-husky.bnd" />
<!-- webapp -->
- <war destfile="${tests.output.dir}/test-libs/example-webapp.war"
+ <war destfile="${tests.output.dir}/test-libs/example-webapp.jar"
manifest="${tests.resources.dir}/webapp/META-INF/MANIFEST.MF"
webxml="${tests.resources.dir}/webapp/WEB-INF/web.xml">
<classes dir="${tests.classes.dir}">
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-08 04:01:40 UTC (rev 94497)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppTestCase.java 2009-10-08 04:11:40 UTC (rev 94498)
@@ -53,7 +53,7 @@
runtime = new OSGiTestHelper().getDefaultRuntime();
runtime.addCapability(new WebAppCapability());
- OSGiBundle bundle = runtime.installBundle("example-webapp.war");
+ OSGiBundle bundle = runtime.installBundle("example-webapp.jar");
bundle.start();
}
16 years, 2 months
JBoss-OSGI SVN: r94496 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/runtime/conf and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-07 23:49:49 -0400 (Wed, 07 Oct 2009)
New Revision: 94496
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-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/server/conf/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
Log:
Add org.apache.log4j;version=1.2
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 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-10-08 03:49:49 UTC (rev 94496)
@@ -32,7 +32,7 @@
org.xml.sax,
<!-- log4j -->
- org.apache.log4j,
+ org.apache.log4j;version=1.2,
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
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 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-10-08 03:49:49 UTC (rev 94496)
@@ -31,7 +31,7 @@
org.jnp.interfaces;version=5.0,
<!-- log4j -->
- org.apache.log4j,
+ org.apache.log4j;version=1.2,
<!-- jboss-osgi -->
org.jboss.osgi.jbossxb;version=2.0,
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 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-08 03:49:49 UTC (rev 94496)
@@ -22,7 +22,7 @@
<entry><key>org.osgi.framework.system.packages.extra</key><value>
<!-- log4j -->
- org.apache.log4j,
+ org.apache.log4j;version=1.2,
<!-- jboss -->
org.jboss.beans.metadata.plugins;version=2.0,
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 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -58,7 +58,7 @@
javax.xml.transform.dom, \
javax.xml.transform.sax, \
javax.xml.transform.stream, \
- org.apache.log4j, \
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
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 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-10-08 03:49:49 UTC (rev 94496)
@@ -23,7 +23,7 @@
com.sun.xml.internal.bind.v2,
<!-- log4j -->
- org.apache.log4j,
+ org.apache.log4j;version=1.2,
<!-- jboss -->
org.jboss.beans.metadata.plugins;version=2.0,
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -27,7 +27,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
- org.apache.log4j, \
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -21,7 +21,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
- org.apache.log4j, \
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -8,7 +8,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
- org.apache.log4j, \
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.osgi.spi;version=1.0, \
org.jboss.osgi.spi.capability;version=1.0, \
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -27,7 +27,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
- org.apache.log4j, \
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-08 03:49:49 UTC (rev 94496)
@@ -18,9 +18,14 @@
<entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/osgi-store</value></entry>
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
+
<!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
com.sun.xml.internal.bind.v2,
+
+ <!-- log4j -->
+ org.apache.log4j;version=1.2,
+ <!-- jboss -->
org.jboss.beans.metadata.plugins;version=2.0,
org.jboss.beans.metadata.plugins.builder;version=2.0,
org.jboss.beans.metadata.spi;version=2.0,
@@ -29,6 +34,7 @@
org.jboss.kernel.spi.dependency;version=2.0,
org.jboss.logging;version=2.0,
+ <!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
org.jboss.osgi.spi.framework;version=1.0,
Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -16,6 +16,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.osgi.spi;version=1.0, \
org.jboss.osgi.spi.capability;version=1.0, \
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-08 03:49:49 UTC (rev 94496)
@@ -19,13 +19,13 @@
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.framework.system.packages.extra</key><value>
- org.apache.log4j,
- org.apache.log4j.spi,
- org.apache.log4j.xml,
-
<!-- [JBOSGI-145] JAXB classes are loaded from the system classpath -->
com.sun.xml.internal.bind.v2,
+ <!-- log4j -->
+ org.apache.log4j;version=1.2,
+
+ <!-- jboss -->
org.jboss.beans.metadata.plugins;version=2.0,
org.jboss.beans.metadata.plugins.builder;version=2.0,
org.jboss.beans.metadata.spi;version=2.0,
@@ -34,6 +34,7 @@
org.jboss.kernel.spi.dependency;version=2.0,
org.jboss.logging;version=2.0,
+ <!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
org.jboss.osgi.spi.capability;version=1.0,
org.jboss.osgi.spi.framework;version=1.0,
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -13,6 +13,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -16,6 +16,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.common.log;version=1.0, \
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -14,7 +14,7 @@
# Extra System Packages
org.osgi.framework.system.packages=\
javax.management, \
- org.apache.log4j, \
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:42:53 UTC (rev 94495)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:49:49 UTC (rev 94496)
@@ -13,7 +13,7 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
- org.apache.log4j, \
+ org.apache.log4j;version=1.2, \
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
16 years, 2 months
JBoss-OSGI SVN: r94495 - projects/jboss-osgi/projects/bundles/common/trunk.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-10-07 23:42:53 -0400 (Wed, 07 Oct 2009)
New Revision: 94495
Modified:
projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
Log:
Fix typo
Modified: projects/jboss-osgi/projects/bundles/common/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-10-08 03:10:33 UTC (rev 94494)
+++ projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-10-08 03:42:53 UTC (rev 94495)
@@ -89,7 +89,7 @@
</Export-Package>
<Import-Package>
javax.management,
- org.apache.log4j;version="1.2";resolution=optional,
+ org.apache.log4j;version="1.2";resolution:=optional,
org.jboss.osgi.spi.management;version="1.0",
org.jboss.osgi.spi.logging;version="1.0",
org.jboss.osgi.spi.service;version="1.0",
16 years, 2 months