April 2009 - jboss-osgi-commits - Jboss List Archives

JBoss-OSGI SVN: r87457 - projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 17:13:31 -0400 (Thu, 16 Apr 2009) New Revision: 87457 Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml Log: Use multiple build steps Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml 2009-04-16 20:59:54 UTC (rev 87456) +++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml 2009-04-16 21:13:31 UTC (rev 87457) @@ -1,7 +1,11 @@ <?xml version='1.0' encoding='UTF-8'?> -<maven2-moduleset> +<project> <actions/> <description>Build and test embedded JBossOSGi @version.id@</description> + <logRotator> + <daysToKeep>60</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> <keepDependencies>false</keepDependencies> <properties/> <scm class="hudson.scm.SubversionSCM"> @@ -18,20 +22,34 @@ </browser> <excludedRegions></excludedRegions> </scm> - <assignedNode>master</assignedNode> - <canRoam>false</canRoam> - <disabled>false</disabled> + <canRoam>true</canRoam> + <disabled>true</disabled> <jdk>jdk1.6</jdk> - <triggers class="vector"/> - <rootModule> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - </rootModule> - <goals>clean package</goals> - <aggregatorStyleBuild>true</aggregatorStyleBuild> - <usePrivateRepository>false</usePrivateRepository> - <ignoreUpstremChanges>true</ignoreUpstremChanges> - <reporters/> - <publishers/> + <triggers class="vector"> + </triggers> + <builders> + <hudson.tasks.Maven> + <targets>clean install</targets> + <mavenName>apache-maven</mavenName> + </hudson.tasks.Maven> + <hudson.tasks.Shell> + <command> +OSGIDIR=$WORKSPACE/jboss-osgi + +# +# copy test.log to workspace +# +TESTLOG=$OSGIDIR/testsuite/functional/target/test.log +if [ -e $TESTLOG ]; then + cp $TESTLOG $WORKSPACE/functional_testlog_build_$BUILD_NUMBER.txt +fi + </command> + </hudson.tasks.Shell> + </builders> + <publishers> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + </publishers> <buildWrappers/> -</maven2-moduleset> \ No newline at end of file +</project> \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87456 - projects/jboss-osgi/trunk/build/hudson/hudson-home.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 16:59:54 -0400 (Thu, 16 Apr 2009) New Revision: 87456 Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh Log: copy test.log to workspace Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh =================================================================== --- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-04-16 20:43:13 UTC (rev 87455) +++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-04-16 20:59:54 UTC (rev 87456) @@ -93,3 +93,11 @@ $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log cp $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE/jboss-server.log + +# +# copy test.log to workspace +# +TESTLOG=$OSGIDIR/testsuite/functional/target/test.log +if [ -e $TESTLOG ]; then + cp $TESTLOG $WORKSPACE/functional_testlog_build_$BUILD_NUMBER.txt +fi \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87455 - in projects/jboss-osgi/trunk: runtime/felix/src/test/java/org/jboss/test/osgi/felix and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 16:43:13 -0400 (Thu, 16 Apr 2009) New Revision: 87455 Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java Log: [JBOSGI-65] Restore felix-1.6.0 Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-16 20:39:44 UTC (rev 87454) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-16 20:43:13 UTC (rev 87455) @@ -41,7 +41,7 @@ <version.aqute.bnd>0.0.315</version.aqute.bnd> <version.equinox>3.4.2</version.equinox> <version.felix.configadmin>1.0.10</version.felix.configadmin> - <version.felix.framework>1.4.1</version.felix.framework> + <version.felix.framework>1.6.0</version.felix.framework> <version.felix.http.jetty>1.0.0</version.felix.http.jetty> <version.felix.javax.servlet>1.0.0</version.felix.javax.servlet> <version.felix.log>1.0.0</version.felix.log> Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-16 20:39:44 UTC (rev 87454) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-16 20:43:13 UTC (rev 87455) @@ -47,7 +47,7 @@ Bundle bundle = framework.getSystemBundle(); assertEquals("BundleId == 0", 0, bundle.getBundleId()); - assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName()); + assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); } public void testSystemBundle() @@ -57,6 +57,6 @@ Bundle bundle = framework.getSystemBundle(); assertEquals("BundleId == 0", 0, bundle.getBundleId()); - assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName()); + assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); } } \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87451 - projects/jboss-osgi/branches.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 16:04:10 -0400 (Thu, 16 Apr 2009) New Revision: 87451 Added: projects/jboss-osgi/branches/jbosgi39/ Log: Add jbosgi39 branch Copied: projects/jboss-osgi/branches/jbosgi39 (from rev 87441, projects/jboss-osgi/trunk)

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87450 - projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 14:56:04 -0400 (Thu, 16 Apr 2009) New Revision: 87450 Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java Log: [JBOSGI-65] Restore felix-1.4.1 Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-16 18:05:17 UTC (rev 87449) +++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-16 18:56:04 UTC (rev 87450) @@ -47,7 +47,7 @@ Bundle bundle = framework.getSystemBundle(); assertEquals("BundleId == 0", 0, bundle.getBundleId()); - assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); + assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName()); } public void testSystemBundle() @@ -57,6 +57,6 @@ Bundle bundle = framework.getSystemBundle(); assertEquals("BundleId == 0", 0, bundle.getBundleId()); - assertEquals("SymbolicName", "org.apache.felix.framework", bundle.getSymbolicName()); + assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName()); } } \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87446 - in projects/jboss-osgi/trunk: testsuite/functional and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 14:01:33 -0400 (Thu, 16 Apr 2009) New Revision: 87446 Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml Log: [JBOSGI-65] Restore felix-1.4.1 Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-16 17:19:45 UTC (rev 87445) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-16 18:01:33 UTC (rev 87446) @@ -41,7 +41,7 @@ <version.aqute.bnd>0.0.315</version.aqute.bnd> <version.equinox>3.4.2</version.equinox> <version.felix.configadmin>1.0.10</version.felix.configadmin> - <version.felix.framework>1.6.0</version.felix.framework> + <version.felix.framework>1.4.1</version.felix.framework> <version.felix.http.jetty>1.0.0</version.felix.http.jetty> <version.felix.javax.servlet>1.0.0</version.felix.javax.servlet> <version.felix.log>1.0.0</version.felix.log> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 17:19:45 UTC (rev 87445) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 18:01:33 UTC (rev 87446) @@ -293,8 +293,6 @@  <exclude>org/jboss/test/osgi/deployer/**</exclude> <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> -  - <exclude>org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java</exclude> </excludes> </configuration> </plugin> @@ -328,8 +326,6 @@ <configuration>  <excludes> -  - <exclude>org/jboss/test/osgi/jbosgi39/OSGI39RemoteTestCase.java</exclude> </excludes> </configuration> </plugin>

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87441 - projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 11:52:23 -0400 (Thu, 16 Apr 2009) New Revision: 87441 Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java Log: Optimize imports Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-04-16 15:47:56 UTC (rev 87440) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-04-16 15:52:23 UTC (rev 87441) @@ -23,7 +23,6 @@ // $Id$ -import java.io.IOException; import java.util.jar.Attributes; import java.util.jar.Manifest; @@ -33,7 +32,6 @@ import org.jboss.deployers.vfs.spi.structure.StructureContext; import org.jboss.virtual.VFSUtils; import org.jboss.virtual.VirtualFile; -import org.jboss.virtual.plugins.context.jar.JarUtils; import org.osgi.framework.Constants; /** @@ -44,16 +42,17 @@ */ public class BundleStructureDeployer extends AbstractVFSStructureDeployer { - /* - * * Sets the default relative order 9000. + /** + * Sets the default relative order 9000. */ public BundleStructureDeployer() { setRelativeOrder(9000); } - /* - * * Determine the structure of a bundle deployment + /** + * Determine the structure of a bundle deployment + * * @param context the structure context * @return true when it recognised the context * @throws DeploymentException for an error

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87440 - projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 11:47:56 -0400 (Thu, 16 Apr 2009) New Revision: 87440 Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java Log: [JBOSGI-37] Simplify BundleStructureDeployer Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-04-16 15:46:32 UTC (rev 87439) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-04-16 15:47:56 UTC (rev 87440) @@ -52,9 +52,8 @@ setRelativeOrder(9000); } - /** - * Determine the structure of a bundle deployment - * + /* + * * Determine the structure of a bundle deployment * @param context the structure context * @return true when it recognised the context * @throws DeploymentException for an error @@ -67,89 +66,22 @@ try { - boolean trace = log.isTraceEnabled(); - - // This file is not for me, because I'm only interested - // in root deployments that contan a MANIFEST.MF + // This file is not for me, because I'm only interested + // in root deployments that contain a MANIFEST.MF Manifest manifest = VFSUtils.getManifest(file); if (file != root || manifest == null) return false; - + // This file is also not for me, because I need to see Bundle-SymbolicName Attributes attribs = manifest.getMainAttributes(); String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME); if (symbolicName == null) return false; - - // This code is taken from the JARStructure - if (isLeaf(file) == false) - { - // For non top level directories that don't look like jars - // we require a META-INF otherwise each subdirectory would be a subdeployment - if (JarUtils.isArchive(file.getName()) == false) - { - if (structureContext.isTopLevel() == false) - { - try - { - VirtualFile child = file.getChild("META-INF"); - if (child != null) - { - if (trace) - log.trace("... ok - non top level directory has a META-INF subdirectory"); - } - else - { - if (trace) - log.trace("... no - doesn't look like a jar and no META-INF subdirectory."); - - return false; - } - } - catch (IOException e) - { - log.warn("Exception while checking if file is a jar: " + e); - return false; - } - } - else if (trace) - { - log.trace("... ok - doesn't look like a jar but it is a top level directory."); - } - } - } - else if (JarUtils.isArchive(file.getName())) - { - if (trace) - log.trace("... ok - its an archive or at least pretending to be."); - } - else - { - if (trace) - log.trace("... no - not a directory or an archive."); - return false; - } - boolean valid = true; + // Create a context for this jar file with META-INF as the location for metadata + context = createContext(structureContext, "META-INF"); - if (isSupportsCandidateAnnotations()) - { - StructureContext parentContext = structureContext.getParentContext(); - if (parentContext != null && parentContext.isCandidateAnnotationScanning()) - valid = checkCandidateAnnotations(structureContext, file); - } - - if (valid) - { - // Create a context for this jar file with META-INF as the location for metadata - context = createContext(structureContext, "META-INF"); - - // The classpath is the root - addClassPath(structureContext, file, true, true, context); - - // Note, we do not try children as potential subdeployments - } - return valid; + return true; } catch (Exception e) {

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87438 - in projects/jboss-osgi/trunk: testsuite/functional and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 11:38:41 -0400 (Thu, 16 Apr 2009) New Revision: 87438 Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java projects/jboss-osgi/trunk/testsuite/functional/pom.xml Log: [JBOSGI-37] Done - BundleStructureDeployer Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-04-16 15:35:41 UTC (rev 87437) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-04-16 15:38:41 UTC (rev 87438) @@ -24,13 +24,17 @@ // $Id$ import java.io.IOException; +import java.util.jar.Attributes; +import java.util.jar.Manifest; import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.spi.structure.ContextInfo; import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer; import org.jboss.deployers.vfs.spi.structure.StructureContext; +import org.jboss.virtual.VFSUtils; import org.jboss.virtual.VirtualFile; import org.jboss.virtual.plugins.context.jar.JarUtils; +import org.osgi.framework.Constants; /** * Determine the structure of a Bundle deployment. @@ -65,15 +69,19 @@ { boolean trace = log.isTraceEnabled(); - // Ignore child archives - if (file != root && JarUtils.isArchive(file.getName()) == true) - { - if (trace) - log.trace("... no - ignoring child archive"); - + // This file is not for me, because I'm only interested + // in root deployments that contan a MANIFEST.MF + Manifest manifest = VFSUtils.getManifest(file); + if (file != root || manifest == null) return false; - } - + + // This file is also not for me, because I need to see Bundle-SymbolicName + Attributes attribs = manifest.getMainAttributes(); + String symbolicName = attribs.getValue(Constants.BUNDLE_SYMBOLICNAME); + if (symbolicName == null) + return false; + + // This code is taken from the JARStructure if (isLeaf(file) == false) { // For non top level directories that don't look like jars @@ -138,9 +146,8 @@ // The classpath is the root addClassPath(structureContext, file, true, true, context); - - // We try all the children as potential subdeployments - addAllChildren(structureContext); + + // Note, we do not try children as potential subdeployments } return valid; } Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 15:35:41 UTC (rev 87437) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 15:38:41 UTC (rev 87438) @@ -328,7 +328,6 @@ <configuration>  <excludes> - <exclude>org/jboss/test/osgi/jbosgi37/*RemoteTestCase.java</exclude>  <exclude>org/jboss/test/osgi/jbosgi39/OSGI39RemoteTestCase.java</exclude> </excludes>

16 years, 8 months

1
0
0 / 0

JBoss-OSGI SVN: r87435 - projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 11:11:46 -0400 (Thu, 16 Apr 2009) New Revision: 87435 Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java Log: Add javadoc Modified: projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-04-16 15:10:52 UTC (rev 87434) +++ projects/jboss-osgi/trunk/runtime/deployer/src/main/java/org/jboss/osgi/deployer/BundleStructureDeployer.java 2009-04-16 15:11:46 UTC (rev 87435) @@ -48,6 +48,13 @@ setRelativeOrder(9000); } + /** + * Determine the structure of a bundle deployment + * + * @param context the structure context + * @return true when it recognised the context + * @throws DeploymentException for an error + */ public boolean determineStructure(StructureContext structureContext) throws DeploymentException { ContextInfo context = null; @@ -58,7 +65,8 @@ { boolean trace = log.isTraceEnabled(); - if (JarUtils.isArchive(file.getName()) == true && file != root) + // Ignore child archives + if (file != root && JarUtils.isArchive(file.getName()) == true) { if (trace) log.trace("... no - ignoring child archive");

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits April 2009