February 2010 - jboss-osgi-commits

JBoss-OSGI SVN: r100665 - projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-07 07:11:45 -0500 (Sun, 07 Feb 2010) New Revision: 100665 Added: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml Log: Add more trace logging Added: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml (rev 0) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600/jboss-logging.xml 2010-02-07 12:11:45 UTC (rev 100665) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + +<logging xmlns="urn:jboss:logging:6.0" xmlns:b="urn:jboss:bean-deployer:2.0"> + +  +  +  + +  + + <periodic-rotating-file-handler + file-name="${jboss.server.log.dir}/server.log" + name="FILE" + autoflush="true" + append="false" + suffix=".yyyy-MM-dd">  + + <error-manager> + <only-once/> + </error-manager> + + <formatter> +  +  + <pattern-formatter pattern="%d %-5p [%c] (%t) %m%n"/> + </formatter> + </periodic-rotating-file-handler> + +  +  +  + + <console-handler name="CONSOLE" autoflush="true" target="System.out"> + <error-manager> + <only-once/> + </error-manager> + + <level name="INFO"/> + + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] %m%n"/> + </formatter> + </console-handler> + +  +  +  +  +  +  + +  + <logger category="org.jboss.osgi"> + <level name="TRACE"/> + </logger> + + +  +  +  + + <root-logger> +  + <level name="${jboss.server.log.threshold:INFO}"/> + <handlers> + <handler-ref name="CONSOLE"/> + <handler-ref name="FILE"/> + </handlers> + </root-logger> + +</logging>

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r100664 - in projects/jboss-osgi/projects: bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal and 2 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-07 07:11:24 -0500 (Sun, 07 Feb 2010) New Revision: 100664 Added: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractInvoker.java Removed: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/BasicRequest.java projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/BasicResponse.java projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java Log: Add more trace logging Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-02-07 12:10:17 UTC (rev 100663) +++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-02-07 12:11:24 UTC (rev 100664) @@ -216,7 +216,7 @@ </property> <property> <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + <value>org.jboss.osgi.husky.internal.AbstractInvoker</value> </property> <property> <name>test.archive.directory</name> Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2010-02-07 12:10:17 UTC (rev 100663) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractConnector.java 2010-02-07 12:11:24 UTC (rev 100664) @@ -37,6 +37,8 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An abstract {@link Connector} implementation @@ -46,6 +48,9 @@ */ public abstract class AbstractConnector implements Connector { + // Provide logging + final Logger log = LoggerFactory.getLogger(AbstractConnector.class); + private BundleContext context; public AbstractConnector(BundleContext context) @@ -138,6 +143,8 @@ ObjectInputStream ois = new ObjectInputStream(reqStream); request = (Request)ois.readObject(); + log.debug("Start invoke: " + request); + // Field the request through the abstract connector response = process(request); } @@ -152,6 +159,10 @@ } response.addFailure(failure); } + finally + { + log.debug("End invoke: " + response); + } // Marshall the Response try Copied: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractInvoker.java (from rev 100650, projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java) =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractInvoker.java (rev 0) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/AbstractInvoker.java 2010-02-07 12:11:24 UTC (rev 100664) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.husky.internal; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.MBeanServerConnection; +import javax.management.MBeanServerFactory; + +import org.jboss.osgi.husky.Invoker; +import org.jboss.osgi.husky.Request; +import org.jboss.osgi.husky.Response; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * An {@link Invoker} suitable for OSGi bundle testing. + * + * It delegates the invocation to + * + * #1 {@link SocketInvocation} + * #2 {@link JMXInvocation} + * + * @author Thomas.Diesler(a)jboss.com + * @since 16-May-2009 + */ +public class AbstractInvoker implements Invoker +{ + // Provide logging + final Logger log = LoggerFactory.getLogger(AbstractInvoker.class); + + public Response invoke(Request req) + { + log.debug("Start invoke: " + req); + + Response res = null; + try + { + MBeanServerConnection server = getMBeanServer(); + if (SocketInvocation.isRemoteConnection()) + { + res = new SocketInvocation().invoke(req); + } + else + { + res = new JMXInvocation().invoke(server, req); + } + return res; + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new IllegalStateException("Cannot invoke connector", ex); + } + finally + { + log.debug("End invoke: " + res); + } + } + + @SuppressWarnings("unchecked") + private MBeanServerConnection getMBeanServer() + { + ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null); + if (serverArr.size() > 1) + throw new IllegalStateException("Multiple MBeanServer instances not supported"); + + MBeanServer server = null; + if (serverArr.size() == 1) + server = serverArr.get(0); + + if (server == null) + server = MBeanServerFactory.createMBeanServer(); + + return server; + } + +} Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/BasicRequest.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/BasicRequest.java 2010-02-07 12:10:17 UTC (rev 100663) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/BasicRequest.java 2010-02-07 12:11:24 UTC (rev 100664) @@ -40,6 +40,11 @@ public BasicRequest(String className, String methodName) { + if (className == null) + throw new IllegalArgumentException("Null className"); + if (methodName == null) + throw new IllegalArgumentException("Null methodName"); + this.className = className; this.methodName = methodName; } @@ -54,4 +59,14 @@ return methodName; } + @Override + public String toString() + { + String testName = className; + int dotIndex = testName.lastIndexOf("."); + if (dotIndex > 0) + testName = testName.substring(dotIndex + 1); + testName = testName + "." + methodName; + return "BasicRequest[" + testName + "]"; + } } Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/BasicResponse.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/BasicResponse.java 2010-02-07 12:10:17 UTC (rev 100663) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/BasicResponse.java 2010-02-07 12:11:24 UTC (rev 100664) @@ -39,16 +39,28 @@ public class BasicResponse implements Response { private static final long serialVersionUID = 1L; - + private List<Failure> failures = new ArrayList<Failure>(); public List<Failure> getFailures() { return Collections.unmodifiableList(failures); } - + public void addFailure(Failure failure) { failures.add(failure); } + + @Override + public String toString() + { + StringBuffer msgs = new StringBuffer(); + for (int i = 0; i < failures.size(); i++) + { + Failure f = failures.get(i); + msgs.append((i > 0 ? "," : "") + f.getMessage()); + } + return "BasicResponse[" + msgs + "]"; + } } Deleted: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java =================================================================== --- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java 2010-02-07 12:10:17 UTC (rev 100663) +++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/internal/OSGiInvoker.java 2010-02-07 12:11:24 UTC (rev 100664) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.husky.internal; - -// $Id$ - -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.MBeanServerConnection; -import javax.management.MBeanServerFactory; - -import org.jboss.osgi.husky.Invoker; -import org.jboss.osgi.husky.Request; -import org.jboss.osgi.husky.Response; - -/** - * An {@link Invoker} suitable for OSGi bundle testing. - * - * It delegates the invocation to - * - * #1 {@link SocketInvocation} - * #2 {@link JMXInvocation} - * - * @author Thomas.Diesler(a)jboss.com - * @since 16-May-2009 - */ -public class OSGiInvoker implements Invoker -{ - public Response invoke(Request req) - { - try - { - MBeanServerConnection server = getMBeanServer(); - if (SocketInvocation.isRemoteConnection()) - { - return new SocketInvocation().invoke(req); - } - else - { - return new JMXInvocation().invoke(server, req); - } - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new IllegalStateException("Cannot invoke connector", ex); - } - } - - @SuppressWarnings("unchecked") - private MBeanServerConnection getMBeanServer() - { - ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null); - if (serverArr.size() > 1) - throw new IllegalStateException("Multiple MBeanServer instances not supported"); - - MBeanServer server = null; - if (serverArr.size() == 1) - server = serverArr.get(0); - - if (server == null) - server = MBeanServerFactory.createMBeanServer(); - - return server; - } - -} Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-07 12:10:17 UTC (rev 100663) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleTracker.java 2010-02-07 12:11:24 UTC (rev 100664) @@ -73,6 +73,9 @@ private ManagedBundle register(Bundle bundle) { + if (log.isTraceEnabled()) + log.trace("register(" + bundle + ")"); + try { ManagedBundle mb = new ManagedBundle(systemContext, bundle); @@ -95,6 +98,9 @@ private void unregister(Bundle bundle) { + if (log.isTraceEnabled()) + log.trace("unregister(" + bundle + ")"); + try { ObjectName oname = ManagedBundle.getObjectName(bundle); Modified: projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java 2010-02-07 12:10:17 UTC (rev 100663) +++ projects/jboss-osgi/projects/bundles/jmx/trunk/src/main/java/org/jboss/osgi/jmx/internal/ManagedFrameworkImpl.java 2010-02-07 12:11:24 UTC (rev 100664) @@ -24,11 +24,12 @@ //$Id$ import static org.jboss.osgi.spi.OSGiConstants.DOMAIN_NAME; +import static org.jboss.osgi.spi.management.ManagedBundle.PROPERTY_ID; import static org.jboss.osgi.spi.management.ManagedBundle.PROPERTY_SYMBOLIC_NAME; import static org.jboss.osgi.spi.management.ManagedBundle.PROPERTY_VERSION; -import static org.jboss.osgi.spi.management.ManagedBundle.PROPERTY_ID; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -115,6 +116,9 @@ } } + if (log.isTraceEnabled()) + log.trace("getBundle(" + symbolicName + "," + version + ") => " + oname); + return oname; } @@ -129,6 +133,9 @@ if (names.size() > 0) oname = names.iterator().next(); + if (log.isTraceEnabled()) + log.trace("getBundle(" + bundleId + ") => " + oname); + return oname; } @@ -141,6 +148,10 @@ ObjectName pattern = ObjectNameFactory.create(DOMAIN_NAME + ":*"); Set<ObjectName> names = mbeanServer.queryNames(pattern, new IsBundleQueryExp()); + + if (log.isTraceEnabled()) + log.trace("getBundles() => " + names); + return names; } @@ -156,7 +167,11 @@ props.put(key, sref.getProperty(key)); } - return new ManagedServiceReference(props); + ManagedServiceReference msref = new ManagedServiceReference(props); + if (log.isTraceEnabled()) + log.trace("getServiceReference(" + clazz + ") => " + msref); + + return msref; } public ManagedServiceReference[] getServiceReferences(String clazz, String filter) @@ -185,15 +200,21 @@ } } - ManagedServiceReference[] manrefs = null; + ManagedServiceReference[] msrefs = null; if (foundRefs.size() > 0) - manrefs = foundRefs.toArray(new ManagedServiceReference[foundRefs.size()]); + msrefs = foundRefs.toArray(new ManagedServiceReference[foundRefs.size()]); - return manrefs; + if (log.isTraceEnabled()) + log.trace("getServiceReferences(" + clazz + "," + filter +") => " + msrefs); + + return msrefs; } public void refreshPackages(ObjectName[] objectNames) { + if (log.isTraceEnabled()) + log.trace("refreshPackages(" + Arrays.asList(objectNames) +")"); + Bundle[] bundleArr = getBundles(objectNames); ServiceReference sref = getBundleContext().getServiceReference(PackageAdmin.class.getName()); PackageAdmin service = (PackageAdmin)getBundleContext().getService(sref); @@ -202,6 +223,9 @@ public boolean resolveBundles(ObjectName[] objectNames) { + if (log.isTraceEnabled()) + log.trace("resolveBundles(" + Arrays.asList(objectNames) +")"); + Bundle[] bundleArr = getBundles(objectNames); ServiceReference sref = getBundleContext().getServiceReference(PackageAdmin.class.getName()); PackageAdmin service = (PackageAdmin)getBundleContext().getService(sref); Modified: projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java =================================================================== --- projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-07 12:10:17 UTC (rev 100663) +++ projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/management/ManagedBundle.java 2010-02-07 12:11:24 UTC (rev 100664) @@ -33,12 +33,15 @@ import javax.management.ObjectName; +import org.jboss.osgi.spi.util.ConstantsHelper; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.ServiceReference; import org.osgi.framework.Version; import org.osgi.service.packageadmin.PackageAdmin; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The managed view of an OSGi Bundle @@ -48,6 +51,9 @@ */ public class ManagedBundle implements ManagedBundleMBean { + // Provide logging + final Logger log = LoggerFactory.getLogger(ManagedBundle.class); + public static final String PROPERTY_ID = "id"; public static final String PROPERTY_SYMBOLIC_NAME = "name"; public static final String PROPERTY_VERSION = "version"; @@ -56,16 +62,19 @@ private Bundle bundle; private ObjectName oname; - public ManagedBundle(BundleContext context, Bundle bundle) + public ManagedBundle(BundleContext syscontext, Bundle bundle) { - if (context == null) + if (syscontext == null) throw new IllegalArgumentException("Null system context"); if (bundle == null) throw new IllegalArgumentException("Null bundle"); this.bundle = bundle; - this.systemContext = context; + this.systemContext = syscontext; this.oname = getObjectName(bundle); + + if (log.isTraceEnabled()) + log.trace("new ManagedBundle[" + oname + "]"); } public static ObjectName getObjectName(Bundle bundle) @@ -92,12 +101,22 @@ public String getProperty(String key) { - return bundle.getBundleContext().getProperty(key); + String value = bundle.getBundleContext().getProperty(key); + + if (log.isTraceEnabled()) + log.trace("getProperty[" + oname + "](" + key + ") => " + value); + + return value; } public int getState() { - return bundle.getState(); + int state = bundle.getState(); + + if (log.isTraceEnabled()) + log.trace("getState[" + oname + "] => " + ConstantsHelper.bundleState(state)); + + return state; } public long getBundleId() @@ -112,7 +131,12 @@ public String getLocation() { - return bundle.getLocation(); + String location = bundle.getLocation(); + + if (log.isTraceEnabled()) + log.trace("getLocation[" + oname + "] => " + location); + + return location; } public Dictionary<String, String> getHeaders() @@ -132,46 +156,79 @@ String value = (String)bundleHeaders.get(key); retHeaders.put(key, value); } + + if (log.isTraceEnabled()) + log.trace("getHeaders[" + oname + "](" + locale + ") => " + retHeaders); + return retHeaders; } public String getEntry(String path) { URL url = bundle.getEntry(path); - return url != null ? url.toExternalForm() : null; + String entry = url != null ? url.toExternalForm() : null; + + if (log.isTraceEnabled()) + log.trace("getEntry[" + oname + "](" + path + ") => " + entry); + + return entry; } public String getResource(String name) { URL url = bundle.getResource(name); - return url != null ? url.toExternalForm() : null; + String resource = url != null ? url.toExternalForm() : null; + + if (log.isTraceEnabled()) + log.trace("getResource[" + oname + "](" + name + ") => " + resource); + + return resource; } public ObjectName loadClass(String name) throws ClassNotFoundException { Class<?> clazz = bundle.loadClass(name); Bundle providingBundle = getPackageAdmin().getBundle(clazz); - return providingBundle != null ? getObjectName(providingBundle) : null; + ObjectName oname = providingBundle != null ? getObjectName(providingBundle) : null; + + if (log.isTraceEnabled()) + log.trace("loadClass[" + oname + "](" + name + ") => " + oname); + + return oname; } public File getDataFile(String filename) { BundleContext context = bundle.getBundleContext(); - return context.getDataFile(filename); + File dataFile = context.getDataFile(filename); + + if (log.isTraceEnabled()) + log.trace("getDataFile[" + oname + "](" + filename + ") => " + dataFile); + + return dataFile; } public void start() throws BundleException { + if (log.isTraceEnabled()) + log.trace("start[" + oname + "]"); + bundle.start(); } public void stop() throws BundleException { + if (log.isTraceEnabled()) + log.trace("stop[" + oname + "]"); + bundle.stop(); } public void update() throws BundleException { + if (log.isTraceEnabled()) + log.trace("update[" + oname + "]"); + bundle.update(); }

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r100663 - in projects/jboss-osgi/branches/1.0.0.Beta6: distribution/installer/src/main/resources/installer and 3 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-07 07:10:17 -0500 (Sun, 07 Feb 2010) New Revision: 100663 Added: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/jbossas/jboss600/ Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/branches/1.0.0.Beta6/pom.xml projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/pom.xml projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/pom.xml Log: Add more trace logging Modified: projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-07 04:23:33 UTC (rev 100662) +++ projects/jboss-osgi/branches/1.0.0.Beta6/distribution/installer/src/main/resources/installer/install-definition.xml 2010-02-07 12:10:17 UTC (rev 100663) @@ -385,6 +385,11 @@ <include name="war-deployers-jboss-beans.xml" /> </fileset> + <fileset condition="isJBoss601" dir="@{deploy.artifacts.dir}/resources/jbossas/jboss600" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy" override="true"> + <include name="jboss-logging.xml" /> + </fileset> +  <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-deployers.jar" /> Modified: projects/jboss-osgi/branches/1.0.0.Beta6/pom.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/pom.xml 2010-02-07 04:23:33 UTC (rev 100662) +++ projects/jboss-osgi/branches/1.0.0.Beta6/pom.xml 2010-02-07 12:10:17 UTC (rev 100663) @@ -60,9 +60,9 @@ <version.jboss.osgi.deployment>1.0.1</version.jboss.osgi.deployment> <version.jboss.osgi.framework>1.0.0.Alpha3</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.4</version.jboss.osgi.hotdeploy> - <version.jboss.osgi.husky>1.0.3</version.jboss.osgi.husky> + <version.jboss.osgi.husky>1.0.4-SNAPSHOT</version.jboss.osgi.husky> <version.jboss.osgi.jaxb>2.1.10.SP3</version.jboss.osgi.jaxb> - <version.jboss.osgi.jmx>1.0.3</version.jboss.osgi.jmx> + <version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx> <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi> <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta> <version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect> @@ -71,7 +71,7 @@ <version.jboss.osgi.runtime.felix>2.0.2</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.jbossas>1.0.2</version.jboss.osgi.runtime.jbossas> <version.jboss.osgi.serviceloader>1.0.0</version.jboss.osgi.serviceloader> - <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi> + <version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi> <version.jboss.osgi.webapp>0.7.2.SP1</version.jboss.osgi.webapp> <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole> <version.jboss.osgi.xml.binding>2.0.2.Beta4</version.jboss.osgi.xml.binding> @@ -423,7 +423,7 @@ </property> <property> <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + <value>org.jboss.osgi.husky.internal.AbstractInvoker</value> </property> <property> <name>test.archive.directory</name> @@ -471,7 +471,7 @@ </property> <property> <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + <value>org.jboss.osgi.husky.internal.AbstractInvoker</value> </property> <property> <name>org.jboss.osgi.husky.runtime.connector.host</name> Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/pom.xml 2010-02-07 04:23:33 UTC (rev 100662) +++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/example/pom.xml 2010-02-07 12:10:17 UTC (rev 100663) @@ -15,7 +15,7 @@ Set these VM properties in your IDE debugger -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target} - -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker + -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.AbstractInvoker -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs --> Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/pom.xml 2010-02-07 04:23:33 UTC (rev 100662) +++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/pom.xml 2010-02-07 12:10:17 UTC (rev 100663) @@ -15,7 +15,7 @@ Set these VM properties in your IDE debugger -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-functional/target} - -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker + -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.AbstractInvoker -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-functional/target}/test-libs -->

15 years, 10 months

1
0
0 / 0

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

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

Author: alesj Date: 2010-02-06 09:33:57 -0500 (Sat, 06 Feb 2010) New Revision: 100653 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDictionaryFactory.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/JMXDictionaryFactory.java projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java Log: [JBOSGI-141]; fix JMX's MDR usage. Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDictionaryFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDictionaryFactory.java 2010-02-06 14:17:53 UTC (rev 100652) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/AbstractDictionaryFactory.java 2010-02-06 14:33:57 UTC (rev 100653) @@ -64,12 +64,12 @@ } } - protected abstract class AbstractDictionary extends Dictionary<String, Object> + protected class ControllerContextDictionary extends Dictionary<String, Object> { private Map<Object, Object> map; private ControllerContext context; - protected AbstractDictionary(ControllerContext context) + protected ControllerContextDictionary(ControllerContext context) { this.context = context; this.map = new ConcurrentHashMap<Object, Object>(2); @@ -77,7 +77,10 @@ map.put(Constants.OBJECTCLASS, EMPTY); } - protected abstract Object getName(ControllerContext context); + protected Object getName(ControllerContext context) + { + return context.getName(); + } public int size() { Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/JMXDictionaryFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/JMXDictionaryFactory.java 2010-02-06 14:17:53 UTC (rev 100652) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/JMXDictionaryFactory.java 2010-02-06 14:33:57 UTC (rev 100653) @@ -47,19 +47,6 @@ public Dictionary<String, Object> getDictionary(ServiceControllerContext context) { - return null; + return new ControllerContextDictionary(context); } - - private class JMXDictionary extends AbstractDictionary - { - private JMXDictionary(ServiceControllerContext context) - { - super(context); - } - - protected Object getName(ControllerContext context) - { - return ServiceControllerContext.class.cast(context).getObjectName().getCanonicalName(); - } - } } \ No newline at end of file Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java 2010-02-06 14:17:53 UTC (rev 100652) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java 2010-02-06 14:33:57 UTC (rev 100653) @@ -22,19 +22,12 @@ package org.jboss.osgi.framework.bundle; import java.util.Dictionary; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import org.jboss.beans.info.spi.BeanInfo; import org.jboss.dependency.spi.ControllerContext; import org.jboss.kernel.spi.config.KernelConfigurator; import org.jboss.kernel.spi.dependency.KernelControllerContext; import org.jboss.reflect.spi.ClassInfo; -import org.jboss.util.collection.Iterators; -import org.osgi.framework.Constants; /** * Kernel dictionary factory. @@ -58,18 +51,13 @@ return new KernelDictionary(context); } - private class KernelDictionary extends AbstractDictionary + private class KernelDictionary extends ControllerContextDictionary { private KernelDictionary(KernelControllerContext context) { super(context); } - protected Object getName(ControllerContext context) - { - return KernelControllerContext.class.cast(context).getName(); - } - @Override protected ClassInfo getFromNullTarget(ControllerContext context) { Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java 2010-02-06 14:17:53 UTC (rev 100652) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/service/JMXServicesUnitTestCase.java 2010-02-06 14:33:57 UTC (rev 100653) @@ -89,7 +89,7 @@ assertEquals(1, refs.length); ServiceReference ref = refs[0]; assertEquals(bundle, ref.getBundle()); - // assertEquals("test:service=A", ref.getProperty("bean.name")); // TODO - add JMX MDR describe action + assertEquals("test:service=A", ref.getProperty("bean.name")); Class<?> aClass = bundle.loadClass(A.class.getName()); BundleContext bc = bundle.getBundleContext(); assertNotNull(bc);

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r100567 - in projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test: java/javax/jms and 3 other directories.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-05 15:42:27 -0500 (Fri, 05 Feb 2010) New Revision: 100567 Added: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/jms/ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/jms/JMSException.java Removed: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd Log: Use Messaging API Copied: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/jms/JMSException.java (from rev 100556, projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java) =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/jms/JMSException.java (rev 0) +++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/jms/JMSException.java 2010-02-05 20:42:27 UTC (rev 100567) @@ -0,0 +1,105 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package javax.jms; + +/** + * <P>This is the root class of all JMS API exceptions. + * + * <P>It provides the following information: + * <UL> + * <LI> A provider-specific string describing the error. This string is + * the standard exception message and is available via the + * <CODE>getMessage</CODE> method. + * <LI> A provider-specific string error code + * <LI> A reference to another exception. Often a JMS API exception will + * be the result of a lower-level problem. If appropriate, this + * lower-level exception can be linked to the JMS API exception. + * </UL> + **/ + +public class JMSException extends Exception +{ + private static final long serialVersionUID = 8951994251593378324L; + + /** Vendor-specific error code. + **/ + private String errorCode; + + /** <CODE>Exception</CODE> reference. + **/ + private Exception linkedException; + + /** Constructs a <CODE>JMSException</CODE> with the specified reason and + * error code. + * + * @param reason a description of the exception + * @param errorCode a string specifying the vendor-specific + * error code + **/ + public JMSException(String reason, String errorCode) + { + super(reason); + this.errorCode = errorCode; + linkedException = null; + } + + /** Constructs a <CODE>JMSException</CODE> with the specified reason and with + * the error code defaulting to null. + * + * @param reason a description of the exception + **/ + public JMSException(String reason) + { + super(reason); + this.errorCode = null; + linkedException = null; + } + + /** Gets the vendor-specific error code. + * @return a string specifying the vendor-specific + * error code + **/ + public String getErrorCode() + { + return this.errorCode; + } + + /** + * Gets the exception linked to this one. + * + * @return the linked <CODE>Exception</CODE>, null if none + **/ + public Exception getLinkedException() + { + return (linkedException); + } + + /** + * Adds a linked <CODE>Exception</CODE>. + * + * @param ex the linked <CODE>Exception</CODE> + **/ + public synchronized void setLinkedException(Exception ex) + { + linkedException = ex; + } +} Deleted: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java 2010-02-05 20:37:13 UTC (rev 100566) +++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/javax/xml/ws/WebServiceException.java 2010-02-05 20:42:27 UTC (rev 100567) @@ -1,64 +0,0 @@ -/* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. - * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. - */ - -package javax.xml.ws; - -/** The <code>WebServiceException</code> class is the base - * exception class for all JAX-WS API runtime exceptions. - * - * @since JAX-WS 2.0 -**/ - -@SuppressWarnings("serial") -public class WebServiceException extends java.lang.RuntimeException -{ - - /** Constructs a new exception with <code>null</code> as its - * detail message. The cause is not initialized. - **/ - public WebServiceException() - { - super(); - } - - /** Constructs a new exception with the specified detail - * message. The cause is not initialized. - * @param message The detail message which is later - * retrieved using the getMessage method - **/ - public WebServiceException(String message) - { - super(message); - } - - /** Constructs a new exception with the specified detail - * message and cause. - * - * @param message The detail message which is later retrieved - * using the getMessage method - * @param cause The cause which is saved for the later - * retrieval throw by the getCause method - **/ - public WebServiceException(String message, Throwable cause) - { - super(message, cause); - } - - /** Constructs a new WebServiceException with the specified cause - * and a detail message of <tt>(cause==null ? null : - * cause.toString())</tt> (which typically contains the - * class and detail message of <tt>cause</tt>). - * - * @param cause The cause which is saved for the later - * retrieval throw by the getCause method. - * (A <tt>null</tt> value is permitted, and - * indicates that the cause is nonexistent or - * unknown.) - **/ - public WebServiceException(Throwable cause) - { - super(cause); - } -} Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-05 20:37:13 UTC (rev 100566) +++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi287/OSGi287TestCase.java 2010-02-05 20:42:27 UTC (rev 100567) @@ -147,7 +147,7 @@ } @Test - public void testServletAPI() throws Exception + public void testMessagingAPI() throws Exception { OSGiRuntime runtime = getDefaultRuntime(); try @@ -157,14 +157,14 @@ // Import-Package: javax.xml.ws OSGiBundle bundleA = runtime.installBundle("jbosgi287-bundleC.jar"); - OSGiBundle exporterA = bundleA.loadClass("javax.xml.ws.WebServiceException"); + OSGiBundle exporterA = bundleA.loadClass("javax.jms.JMSException"); assertEquals(Bundle.RESOLVED, bundleA.getState()); assertEquals(bundleA, exporterA); // Try to load a class that is not part of the bundle try { - bundleA.loadClass("javax.xml.ws.WebServiceContext"); + bundleA.loadClass("javax.jms.MessageProducer"); fail("ClassNotFoundException expected"); } catch (ClassNotFoundException ex) Modified: projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd =================================================================== --- projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd 2010-02-05 20:37:13 UTC (rev 100566) +++ projects/jboss-osgi/branches/1.0.0.Beta6/testsuite/functional/src/test/resources/jbosgi287/jbosgi287-bundleC.bnd 2010-02-05 20:42:27 UTC (rev 100567) @@ -1,6 +1,6 @@ # bnd build -classpath target/test-classes -output target/test-libs/jbosgi287-bundleB.jar src/test/resources/jbosgi287/jbosgi287-bundle.bnd Bundle-SymbolicName: jbosgi287-bundleC -Export-Package: javax.xml.ws -Import-Package: javax.xml.ws +Export-Package: javax.jms +Import-Package: javax.jms

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r100556 - projects/jboss-osgi/projects/parent/tags.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-05 11:35:23 -0500 (Fri, 05 Feb 2010) New Revision: 100556 Removed: projects/jboss-osgi/projects/parent/tags/jboss-osgi-blueprint-1.0.0.Beta1/ Log: del jboss-osgi-blueprint-1.0.0.Beta1

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r100555 - projects/jboss-osgi/projects/bundles/blueprint/trunk.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-05 11:34:51 -0500 (Fri, 05 Feb 2010) New Revision: 100555 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-05 16:34:40 UTC (rev 100554) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-05 16:34:51 UTC (rev 100555) @@ -20,7 +20,7 @@ <artifactId>jboss-osgi-blueprint</artifactId> <packaging>bundle</packaging> - <version>1.0.0.Beta1</version> + <version>1.0.1.Beta1-SNAPSHOT</version>  <parent> @@ -31,9 +31,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> - <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-blueprint-1.0....</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> + <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> </scm>

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r100554 - in projects/jboss-osgi/projects/bundles/blueprint/tags: jboss-osgi-blueprint-1.0.0.Beta1 and 1 other directory.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-05 11:34:40 -0500 (Fri, 05 Feb 2010) New Revision: 100554 Added: projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1/ projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1/pom.xml Removed: projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1/pom.xml Log: [maven-release-plugin] copy for tag jboss-osgi-blueprint-1.0.0.Beta1 Copied: projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1 (from rev 100520, projects/jboss-osgi/projects/bundles/blueprint/trunk) Property changes on: projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1 ___________________________________________________________________ Name: svn:ignore + target felix-cache Name: svn:mergeinfo + Deleted: projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-05 15:04:53 UTC (rev 100520) +++ projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1/pom.xml 2010-02-05 16:34:40 UTC (rev 100554) @@ -1,333 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  -  -  -  -  -  -  -  - -  - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <name>JBossOSGi Reactor - Blueprint</name> - - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-blueprint</artifactId> - <packaging>bundle</packaging> - - <version>1.0.0.Beta1-SNAPSHOT</version> - -  - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.4</version> - </parent> - -  - <properties> - <version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint> - <version.apache.aries.util>1.0.0.20100120</version.apache.aries.util> - <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> - <version.jboss.osgi.framework>1.0.0.Alpha3-SNAPSHOT</version.jboss.osgi.framework> - <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky> - <version.jboss.osgi.jmx>1.0.3-SNAPSHOT</version.jboss.osgi.jmx> - <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi> - <version.osgi>4.2.0</version.osgi> - - <surefire.jpda.args></surefire.jpda.args> - </properties> - -  - <dependencies> - <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - </dependency> - -  - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - -  - <dependency> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint</artifactId> - <version>${version.apache.aries.blueprint}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.aries</groupId> - <artifactId>org.apache.aries.util</artifactId> - <version>${version.apache.aries.util}</version> - <scope>provided</scope> - </dependency> - <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.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>${version.jboss.osgi.husky}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <version>${version.jboss.osgi.jmx}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-framework</artifactId> - <version>${version.jboss.osgi.framework}</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> - -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - -  - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.blueprint.extender.BlueprintActivator</Bundle-Activator> - <Private-Package> - org.jboss.osgi.blueprint.* - </Private-Package> - <Export-Package> - org.jboss.osgi.blueprint;version=${version}, - </Export-Package> - <Import-Package> - org.jboss.osgi.spi.capability;version=1.0, - org.osgi.framework, - org.osgi.service.blueprint.container;version=1.0, - org.osgi.service.blueprint.reflect;version=1.0, - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> -  - <file>target/${artifactId}-${version}-sources.jar</file> - <classifier>sources</classifier> - <type>jar</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>bundles</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-bundles.xml</descriptor> - </descriptors> - </configuration> - </execution> - <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.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-test-jars</id> - <phase>integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="artifactId" value="${artifactId}" /> - <property name="tests.output.dir" value="${project.build.directory}" /> - <property name="build.artifact" value="${project.build.finalName}" /> - <ant antfile="scripts/antrun-test-jars.xml" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <id>surefire-integration-tests</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <argLine>${surefire.jpda.args}</argLine> - <systemProperties> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -  - <profiles> - -  - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>framework-felix</id> - <activation> - <property> - <name>framework</name> - <value>felix</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>jpda</id> - <activation> - <property> - <name>jpda</name> - </property> - </activation> - <properties> - <surefire.jpda.args>-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</surefire.jpda.args> - </properties> - </profile> - - </profiles> - -</project> Copied: projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1/pom.xml (from rev 100553, projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1/pom.xml (rev 0) +++ projects/jboss-osgi/projects/bundles/blueprint/tags/jboss-osgi-blueprint-1.0.0.Beta1/pom.xml 2010-02-05 16:34:40 UTC (rev 100554) @@ -0,0 +1,339 @@ +<?xml version="1.0" encoding="UTF-8"?> + +  +  +  +  +  +  +  +  + +  + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBossOSGi Reactor - Blueprint</name> + + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-blueprint</artifactId> + <packaging>bundle</packaging> + + <version>1.0.0.Beta1</version> + +  + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-parent</artifactId> + <version>1.0.4</version> + </parent> + +  + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> + <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-blueprint-1.0....</url> + </scm> + +  + <properties> + <version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint> + <version.apache.aries.util>1.0.0.20100120</version.apache.aries.util> + <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common> + <version.jboss.osgi.framework>1.0.0.Alpha3</version.jboss.osgi.framework> + <version.jboss.osgi.husky>1.0.3</version.jboss.osgi.husky> + <version.jboss.osgi.jmx>1.0.3</version.jboss.osgi.jmx> + <version.jboss.osgi.spi>1.0.4</version.jboss.osgi.spi> + <version.osgi>4.2.0</version.osgi> + + <surefire.jpda.args /> + </properties> + +  + <dependencies> + <dependency> + <groupId>biz.aQute</groupId> + <artifactId>bnd</artifactId> + </dependency> + +  + <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> + </dependency> + +  + <dependency> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint</artifactId> + <version>${version.apache.aries.blueprint}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.aries</groupId> + <artifactId>org.apache.aries.util</artifactId> + <version>${version.apache.aries.util}</version> + <scope>provided</scope> + </dependency> + <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.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-husky</artifactId> + <version>${version.jboss.osgi.husky}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-framework</artifactId> + <version>${version.jboss.osgi.framework}</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> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +  + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> + <Bundle-Activator>org.jboss.osgi.blueprint.extender.BlueprintActivator</Bundle-Activator> + <Private-Package> + org.jboss.osgi.blueprint.* + </Private-Package> + <Export-Package> + org.jboss.osgi.blueprint;version=${version}, + </Export-Package> + <Import-Package> + org.jboss.osgi.spi.capability;version=1.0, + org.osgi.framework, + org.osgi.service.blueprint.container;version=1.0, + org.osgi.service.blueprint.reflect;version=1.0, + </Import-Package> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> +  + <file>target/${artifactId}-${version}-sources.jar</file> + <classifier>sources</classifier> + <type>jar</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>bundles</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-bundles.xml</descriptor> + </descriptors> + </configuration> + </execution> + <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.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-test-jars</id> + <phase>integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> + <property name="artifactId" value="${artifactId}" /> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="build.artifact" value="${project.build.finalName}" /> + <ant antfile="scripts/antrun-test-jars.xml" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + <executions> + <execution> + <id>surefire-integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <argLine>${surefire.jpda.args}</argLine> + <systemProperties> + <property> + <name>java.protocol.handler.pkgs</name> + <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> + </property> + <property> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>org.jboss.osgi.husky.Invoker</name> + <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + </systemProperties> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +  + <profiles> + +  + <profile> + <id>framework-equinox</id> + <activation> + <property> + <name>framework</name> + <value>equinox</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>framework-felix</id> + <activation> + <property> + <name>framework</name> + <value>felix</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>jpda</id> + <activation> + <property> + <name>jpda</name> + </property> + </activation> + <properties> + <surefire.jpda.args>-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</surefire.jpda.args> + </properties> + </profile> + + </profiles> +</project>

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r100553 - projects/jboss-osgi/projects/bundles/blueprint/trunk.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-05 11:34:17 -0500 (Fri, 05 Feb 2010) New Revision: 100553 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml Log: [maven-release-plugin] prepare release jboss-osgi-blueprint-1.0.0.Beta1 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-05 16:32:34 UTC (rev 100552) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-05 16:34:17 UTC (rev 100553) @@ -20,7 +20,7 @@ <artifactId>jboss-osgi-blueprint</artifactId> <packaging>bundle</packaging> - <version>1.0.0.Beta1-SNAPSHOT</version> + <version>1.0.0.Beta1</version>  <parent> @@ -29,6 +29,13 @@ <version>1.0.4</version> </parent> +  + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> + <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-blueprint-1.0....</url> + </scm> +  <properties> <version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint>

15 years, 10 months

1
0
0 / 0

JBoss-OSGI SVN: r100552 - projects/jboss-osgi/projects/bundles/blueprint/trunk.

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

Author: thomas.diesler(a)jboss.com Date: 2010-02-05 11:32:34 -0500 (Fri, 05 Feb 2010) New Revision: 100552 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml Log: [maven-release-plugin] rollback the release of jboss-osgi-blueprint-1.0.0.Beta1 Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-05 16:32:05 UTC (rev 100551) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2010-02-05 16:32:34 UTC (rev 100552) @@ -29,13 +29,6 @@ <version>1.0.4</version> </parent> -  - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> - <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> - </scm> -  <properties> <version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint>

15 years, 10 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 February 2010