[jboss-cvs] JBossAS SVN: r82281 - in projects/demos/microcontainer/branches/DZone_1_0: bootstrap and 23 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 15 10:36:49 EST 2008
Author: alesj
Date: 2008-12-15 10:36:49 -0500 (Mon, 15 Dec 2008)
New Revision: 82281
Added:
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/access-mode-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/aliases-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/annotations-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/autowire-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/bean-factory-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/builder-util-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/classloader-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/controller-mode-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/demand-supply-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/install-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/lifecycle-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/value-factory-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/models/src/main/java/org/jboss/demos/models/jmx/MBeanServerQuery.java
projects/demos/microcontainer/branches/DZone_1_0/models/src/main/resources/META-INF/z-mbeanquery-beans.xml
Removed:
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/boostrap/
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java
projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java
Modified:
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/pom.xml
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/resources/META-INF/bootstrap-beans-bak.xml
projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/classloading/pom.xml
projects/demos/microcontainer/branches/DZone_1_0/classloading/src/main/java/org/jboss/demos/bootstrap/cl/ClassLoadingMain.java
projects/demos/microcontainer/branches/DZone_1_0/jmx/pom.xml
projects/demos/microcontainer/branches/DZone_1_0/jmx/src/main/java/org/jboss/demos/bootstrap/jmx/JMXMain.java
projects/demos/microcontainer/branches/DZone_1_0/osgi/boot/bootstrap-beans.xml
projects/demos/microcontainer/branches/DZone_1_0/pom.xml
Log:
Port changes from trunk.
Modified: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/pom.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/bootstrap/pom.xml 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/pom.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -81,10 +81,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap (from rev 82280, projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/bootstrap)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,155 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.bootstrap;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import org.jboss.logging.Logger;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class HDScanner implements Runnable
-{
- private static Logger log = Logger.getLogger(HDScanner.class);
- private ScheduledExecutorService scanExecutor;
- private ScheduledFuture activeScan;
- private String scanThreadName = "HDScanner";
- private long initialDelay = 5000;
- private long scanPeriod = 10000;
-
- private MainDeployerHelper helper;
- private VirtualFile root;
- private Map<String, Long> files = new HashMap<String, Long>();
-
- public HDScanner(MainDeployerHelper helper, String path) throws IOException
- {
- File dir = new File(path);
- if (dir.exists() == false)
- throw new IOException("No such path: " + path);
- if (dir.isDirectory() == false)
- throw new IOException("Path doesn't denote directory: " + dir);
-
- this.helper = helper;
- this.root = VFS.getRoot(dir.toURI());
- }
-
- public void setScanThreadName(String scanThreadName)
- {
- this.scanThreadName = scanThreadName;
- }
-
- public void setInitialDelay(long initialDelay)
- {
- this.initialDelay = initialDelay;
- }
-
- public void setScanPeriod(long scanPeriod)
- {
- this.scanPeriod = scanPeriod;
- }
-
- public void start() throws Exception
- {
- // Default to a single thread executor
- if (scanExecutor == null)
- {
- scanExecutor = Executors.newSingleThreadScheduledExecutor(
- new ThreadFactory()
- {
- public Thread newThread(Runnable r)
- {
- return new Thread(r, scanThreadName);
- }
- }
- );
- }
- activeScan = scanExecutor.scheduleWithFixedDelay(this, initialDelay, scanPeriod, TimeUnit.MILLISECONDS);
- }
-
- public void stop()
- {
- if (activeScan != null)
- {
- activeScan.cancel(true);
- activeScan = null;
- }
- }
-
- public void run()
- {
- try
- {
- scan();
- }
- catch (Throwable e)
- {
- System.err.println("Scan failed: " + e);
- }
- }
-
- protected void scan() throws Throwable
- {
- Map<String, Long> tmp = new HashMap<String, Long>();
- List<VirtualFile> children = root.getChildren();
- for (VirtualFile file : children)
- {
- String fileName = file.getName();
- if (files.containsKey(fileName) == false)
- {
- helper.deploy(file);
- log.info("Deploy: " + file);
- }
- else
- {
- long timestamp = files.get(fileName);
- if (timestamp < file.getLastModified())
- {
- helper.redeploy(file);
- log.info("Redeploy: " + file);
- }
- files.remove(fileName);
- }
- tmp.put(fileName, file.getLastModified());
- }
- for (String fileName : files.keySet())
- {
- helper.undeploy(fileName);
- log.info("Undeploy: " + fileName);
- }
- files.clear();
- files.putAll(tmp);
- log.info("Process deployments...");
- helper.process();
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java (from rev 82280, projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/HDScanner.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,155 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.bootstrap;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+import org.jboss.logging.Logger;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class HDScanner implements Runnable
+{
+ private static Logger log = Logger.getLogger(HDScanner.class);
+ private ScheduledExecutorService scanExecutor;
+ private ScheduledFuture activeScan;
+ private String scanThreadName = "HDScanner";
+ private long initialDelay = 5000;
+ private long scanPeriod = 10000;
+
+ private MainDeployerHelper helper;
+ private VirtualFile root;
+ private Map<String, Long> files = new HashMap<String, Long>();
+
+ public HDScanner(MainDeployerHelper helper, String path) throws IOException
+ {
+ File dir = new File(path);
+ if (dir.exists() == false)
+ throw new IOException("No such path: " + path);
+ if (dir.isDirectory() == false)
+ throw new IOException("Path doesn't denote directory: " + dir);
+
+ this.helper = helper;
+ this.root = VFS.getRoot(dir.toURI());
+ }
+
+ public void setScanThreadName(String scanThreadName)
+ {
+ this.scanThreadName = scanThreadName;
+ }
+
+ public void setInitialDelay(long initialDelay)
+ {
+ this.initialDelay = initialDelay;
+ }
+
+ public void setScanPeriod(long scanPeriod)
+ {
+ this.scanPeriod = scanPeriod;
+ }
+
+ public void start() throws Exception
+ {
+ // Default to a single thread executor
+ if (scanExecutor == null)
+ {
+ scanExecutor = Executors.newSingleThreadScheduledExecutor(
+ new ThreadFactory()
+ {
+ public Thread newThread(Runnable r)
+ {
+ return new Thread(r, scanThreadName);
+ }
+ }
+ );
+ }
+ activeScan = scanExecutor.scheduleWithFixedDelay(this, initialDelay, scanPeriod, TimeUnit.MILLISECONDS);
+ }
+
+ public void stop()
+ {
+ if (activeScan != null)
+ {
+ activeScan.cancel(true);
+ activeScan = null;
+ }
+ }
+
+ public void run()
+ {
+ try
+ {
+ scan();
+ }
+ catch (Throwable e)
+ {
+ System.err.println("Scan failed: " + e);
+ }
+ }
+
+ protected void scan() throws Throwable
+ {
+ Map<String, Long> tmp = new HashMap<String, Long>();
+ List<VirtualFile> children = root.getChildren();
+ for (VirtualFile file : children)
+ {
+ String fileName = file.getName();
+ if (files.containsKey(fileName) == false)
+ {
+ helper.deploy(file);
+ log.info("Deploy: " + file);
+ }
+ else
+ {
+ long timestamp = files.get(fileName);
+ if (timestamp < file.getLastModified())
+ {
+ helper.redeploy(file);
+ log.info("Redeploy: " + file);
+ }
+ files.remove(fileName);
+ }
+ tmp.put(fileName, file.getLastModified());
+ }
+ for (String fileName : files.keySet())
+ {
+ helper.undeploy(fileName);
+ log.info("Undeploy: " + fileName);
+ }
+ files.clear();
+ files.putAll(tmp);
+ log.info("Process deployments...");
+ helper.process();
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,155 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.bootstrap;
-
-import java.io.File;
-import java.net.URL;
-
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
-import org.jboss.util.StringPropertyReplacer;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class Main
-{
- private static Main main;
-
- private Kernel kernel;
- private BasicXMLDeployer kernelDeployer;
-
- public static void main(String[] args)
- {
- main = new Main();
- main.configure(args);
- }
-
- protected void configure(String[] args)
- {
- int index = 0;
-
- // demos.home
- if (System.getProperty("demos.home") == null)
- {
- String demosHome;
- if (args.length > index)
- demosHome = args[index++];
- else
- demosHome = "/projects/demos";
-
- System.setProperty("demos.home", demosHome);
- }
-
- try
- {
- String rootString;
- if (args.length > index)
- rootString = args[index];
- else
- rootString = "${demos.home}/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml";
-
- URL rootURL = getURL(rootString);
- System.out.println("Using bootstrap: " + rootURL.toExternalForm());
-
- BasicBootstrap bootstrap = new BasicBootstrap();
- bootstrap.run();
- kernel = bootstrap.getKernel();
-
- kernelDeployer = new BasicXMLDeployer(kernel);
- kernelDeployer.deploy(rootURL);
- kernelDeployer.validate();
- }
- catch (Throwable t)
- {
- t.printStackTrace();
- }
- }
-
- private static Main getMain()
- {
- if (main == null)
- throw new IllegalArgumentException("Main in not initialized, should run Main.main()!");
-
- return main;
- }
-
- public static URL getURL(String url) throws Exception
- {
- // replace ${} inputs
- url = StringPropertyReplacer.replaceProperties(url, System.getProperties());
- File file = new File(url);
- if (file.exists() == false)
- throw new IllegalArgumentException("No such file: " + url);
-
- return file.toURL();
- }
-
- public static void deploy(String... urls) throws Throwable
- {
- if (urls == null)
- return;
-
- for (String urlString : urls)
- {
- URL url = getURL(urlString);
- getMain().kernelDeployer.deploy(url);
- System.out.println("Deployed URL: " + url);
- }
- }
-
- public static void validate() throws Throwable
- {
- getMain().kernelDeployer.validate();
- }
-
- public static void undeploy(String... urls) throws Throwable
- {
- if (urls == null)
- return;
-
- for (String urlString : urls)
- {
- URL url = getURL(urlString);
- getMain().kernelDeployer.undeploy(url);
- System.out.println("Undeployed URL: " + url);
- }
- }
-
- protected void registerShutdownThread()
- {
- Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownThread()));
- }
-
- private class ShutdownThread implements Runnable
- {
- public void run()
- {
- kernelDeployer.shutdown();
- kernelDeployer = null;
-
- kernel.getController().shutdown();
- kernel = null;
- }
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java (from rev 82280, projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/Main.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,155 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.bootstrap;
+
+import java.io.File;
+import java.net.URL;
+
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
+import org.jboss.util.StringPropertyReplacer;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class Main
+{
+ private static Main main;
+
+ private Kernel kernel;
+ private BasicXMLDeployer kernelDeployer;
+
+ public static void main(String[] args)
+ {
+ main = new Main();
+ main.configure(args);
+ }
+
+ protected void configure(String[] args)
+ {
+ int index = 0;
+
+ // demos.home
+ if (System.getProperty("demos.home") == null)
+ {
+ String demosHome;
+ if (args.length > index)
+ demosHome = args[index++];
+ else
+ demosHome = "/projects/demos";
+
+ System.setProperty("demos.home", demosHome);
+ }
+
+ try
+ {
+ String rootString;
+ if (args.length > index)
+ rootString = args[index];
+ else
+ rootString = "${demos.home}/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml";
+
+ URL rootURL = getURL(rootString);
+ System.out.println("Using bootstrap: " + rootURL.toExternalForm());
+
+ BasicBootstrap bootstrap = new BasicBootstrap();
+ bootstrap.run();
+ kernel = bootstrap.getKernel();
+
+ kernelDeployer = new BasicXMLDeployer(kernel);
+ kernelDeployer.deploy(rootURL);
+ kernelDeployer.validate();
+ }
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+ }
+ }
+
+ private static Main getMain()
+ {
+ if (main == null)
+ throw new IllegalArgumentException("Main in not initialized, should run Main.main()!");
+
+ return main;
+ }
+
+ public static URL getURL(String url) throws Exception
+ {
+ // replace ${} inputs
+ url = StringPropertyReplacer.replaceProperties(url, System.getProperties());
+ File file = new File(url);
+ if (file.exists() == false)
+ throw new IllegalArgumentException("No such file: " + url);
+
+ return file.toURL();
+ }
+
+ public static void deploy(String... urls) throws Throwable
+ {
+ if (urls == null)
+ return;
+
+ for (String urlString : urls)
+ {
+ URL url = getURL(urlString);
+ getMain().kernelDeployer.deploy(url);
+ System.out.println("Deployed URL: " + url);
+ }
+ }
+
+ public static void validate() throws Throwable
+ {
+ getMain().kernelDeployer.validate();
+ }
+
+ public static void undeploy(String... urls) throws Throwable
+ {
+ if (urls == null)
+ return;
+
+ for (String urlString : urls)
+ {
+ URL url = getURL(urlString);
+ getMain().kernelDeployer.undeploy(url);
+ System.out.println("Undeployed URL: " + url);
+ }
+ }
+
+ protected void registerShutdownThread()
+ {
+ Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownThread()));
+ }
+
+ private class ShutdownThread implements Runnable
+ {
+ public void run()
+ {
+ kernelDeployer.shutdown();
+ kernelDeployer = null;
+
+ kernel.getController().shutdown();
+ kernel = null;
+ }
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,89 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.bootstrap;
-
-import java.util.Map;
-import java.util.HashMap;
-
-import org.jboss.deployers.client.spi.DeployerClient;
-import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class MainDeployerHelper
-{
- private DeployerClient deployerClient;
- private VFSDeploymentFactory factory;
- private Map<String, Deployment> deployments;
-
- public MainDeployerHelper(DeployerClient deployerClient)
- {
- this.deployerClient = deployerClient;
- this.deployments = new HashMap<String, Deployment>();
- }
-
- protected VFSDeploymentFactory getDeploymentFactory()
- {
- if (factory == null)
- factory = VFSDeploymentFactory.getInstance();
- return factory;
- }
-
- protected Deployment createDeployment(VirtualFile file)
- {
- return getDeploymentFactory().createVFSDeployment(file);
- }
-
- protected Deployment handleDeployment(VirtualFile file) throws DeploymentException
- {
- Deployment deployment = createDeployment(file);
- deployerClient.addDeployment(deployment);
- return deployments.put(file.getName(), deployment);
- }
-
- public void deploy(VirtualFile file) throws DeploymentException
- {
- handleDeployment(file);
- }
-
- public void redeploy(VirtualFile file) throws DeploymentException
- {
- handleDeployment(file);
- }
-
- public void undeploy(String fileName) throws DeploymentException
- {
- Deployment deployment = deployments.get(fileName);
- if (deployment != null)
- deployerClient.removeDeployment(deployment);
- }
-
- public void process() throws DeploymentException
- {
- deployerClient.process();
- deployerClient.checkComplete();
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java (from rev 82280, projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/java/org/jboss/demos/bootstrap/MainDeployerHelper.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,89 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.bootstrap;
+
+import java.util.Map;
+import java.util.HashMap;
+
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MainDeployerHelper
+{
+ private DeployerClient deployerClient;
+ private VFSDeploymentFactory factory;
+ private Map<String, Deployment> deployments;
+
+ public MainDeployerHelper(DeployerClient deployerClient)
+ {
+ this.deployerClient = deployerClient;
+ this.deployments = new HashMap<String, Deployment>();
+ }
+
+ protected VFSDeploymentFactory getDeploymentFactory()
+ {
+ if (factory == null)
+ factory = VFSDeploymentFactory.getInstance();
+ return factory;
+ }
+
+ protected Deployment createDeployment(VirtualFile file)
+ {
+ return getDeploymentFactory().createVFSDeployment(file);
+ }
+
+ protected Deployment handleDeployment(VirtualFile file) throws DeploymentException
+ {
+ Deployment deployment = createDeployment(file);
+ deployerClient.addDeployment(deployment);
+ return deployments.put(file.getName(), deployment);
+ }
+
+ public void deploy(VirtualFile file) throws DeploymentException
+ {
+ handleDeployment(file);
+ }
+
+ public void redeploy(VirtualFile file) throws DeploymentException
+ {
+ handleDeployment(file);
+ }
+
+ public void undeploy(String fileName) throws DeploymentException
+ {
+ Deployment deployment = deployments.get(fileName);
+ if (deployment != null)
+ deployerClient.removeDeployment(deployment);
+ }
+
+ public void process() throws DeploymentException
+ {
+ deployerClient.process();
+ deployerClient.checkComplete();
+ }
+}
Modified: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/resources/META-INF/bootstrap-beans-bak.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/resources/META-INF/bootstrap-beans-bak.xml 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/resources/META-INF/bootstrap-beans-bak.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -136,13 +136,13 @@
<!-- Hotdeployment of applications -->
- <bean name="MainDeployerHelper" class="org.jboss.demos.boostrap.MainDeployerHelper">
+ <bean name="MainDeployerHelper" class="org.jboss.demos.bootstrap.MainDeployerHelper">
<constructor>
<parameter><inject bean="MainDeployer"/></parameter>
</constructor>
</bean>
- <bean name="HDScanner" class="org.jboss.demos.boostrap.HDScanner">
+ <bean name="HDScanner" class="org.jboss.demos.bootstrap.HDScanner">
<constructor>
<parameter><inject bean="MainDeployerHelper"/></parameter>
<parameter>C:\\projects\\demos\\osgi\\boot\\work</parameter>
Modified: projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -105,13 +105,13 @@
<!-- HD scanner -->
- <bean name="MainDeployerHelper" class="org.jboss.demos.boostrap.MainDeployerHelper">
+ <bean name="MainDeployerHelper" class="org.jboss.demos.bootstrap.MainDeployerHelper">
<constructor>
<parameter><inject bean="MainDeployer"/></parameter>
</constructor>
</bean>
- <bean name="HDScanner" class="org.jboss.demos.boostrap.HDScanner">
+ <bean name="HDScanner" class="org.jboss.demos.bootstrap.HDScanner">
<constructor>
<parameter><inject bean="MainDeployerHelper"/></parameter>
<parameter>${demos.home}/sandbox</parameter>
Modified: projects/demos/microcontainer/branches/DZone_1_0/classloading/pom.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/classloading/pom.xml 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/classloading/pom.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -76,10 +76,6 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: projects/demos/microcontainer/branches/DZone_1_0/classloading/src/main/java/org/jboss/demos/bootstrap/cl/ClassLoadingMain.java
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/classloading/src/main/java/org/jboss/demos/bootstrap/cl/ClassLoadingMain.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/classloading/src/main/java/org/jboss/demos/bootstrap/cl/ClassLoadingMain.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -21,7 +21,7 @@
*/
package org.jboss.demos.bootstrap.cl;
-import org.jboss.demos.boostrap.Main;
+import org.jboss.demos.bootstrap.Main;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,94 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.demos.ioc.access;
-
-import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.kernel.spi.config.KernelConfigurator;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
-import org.jboss.reflect.spi.ClassInfo;
-import org.jboss.reflect.spi.FieldInfo;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class ConstantsProvider
-{
- private KernelConfigurator configurator;
- private String className;
- private ClassInfo classInfo;
-
- public ConstantsProvider()
- {
- }
-
- public ConstantsProvider(String className)
- {
- this.className = className;
- }
-
- @Inject(bean = KernelConstants.KERNEL_CONFIGURATOR_NAME)
- public void setConfigurator(KernelConfigurator configurator)
- {
- this.configurator = configurator;
- }
-
- protected ClassLoader getClassLoader()
- {
- Thread thread = Thread.currentThread();
- return thread.getContextClassLoader();
- }
-
- public void create() throws Throwable
- {
- if (configurator == null)
- throw new IllegalArgumentException("Null configurator");
-
- if (className != null)
- classInfo = configurator.getClassInfo(className, getClassLoader());
- }
-
- public Object getConstant(String constantName) throws Throwable
- {
- if (classInfo == null)
- throw new IllegalArgumentException("Cannot execute constant lookup on null class info.");
-
- return getConstant(classInfo, constantName);
- }
-
- public Object getConstant(String className, String constantName) throws Throwable
- {
- ClassInfo classInfo = configurator.getClassInfo(className, getClassLoader());
- return getConstant(classInfo, constantName);
- }
-
- protected Object getConstant(ClassInfo classInfo, String constantName) throws Throwable
- {
- if (constantName == null)
- throw new IllegalArgumentException("Null constant name");
-
- FieldInfo field = classInfo.getDeclaredField(constantName);
- if (field == null)
- throw new IllegalArgumentException("No such constant: " + constantName + ", class info: " + classInfo);
-
- return field.get(null);
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/ConstantsProvider.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.demos.ioc.access;
+
+import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.kernel.spi.config.KernelConfigurator;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
+import org.jboss.reflect.spi.ClassInfo;
+import org.jboss.reflect.spi.FieldInfo;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ConstantsProvider
+{
+ private KernelConfigurator configurator;
+ private String className;
+ private ClassInfo classInfo;
+
+ public ConstantsProvider()
+ {
+ }
+
+ public ConstantsProvider(String className)
+ {
+ this.className = className;
+ }
+
+ @Inject(bean = KernelConstants.KERNEL_CONFIGURATOR_NAME)
+ public void setConfigurator(KernelConfigurator configurator)
+ {
+ this.configurator = configurator;
+ }
+
+ protected ClassLoader getClassLoader()
+ {
+ Thread thread = Thread.currentThread();
+ return thread.getContextClassLoader();
+ }
+
+ public void create() throws Throwable
+ {
+ if (configurator == null)
+ throw new IllegalArgumentException("Null configurator");
+
+ if (className != null)
+ classInfo = configurator.getClassInfo(className, getClassLoader());
+ }
+
+ public Object getConstant(String constantName) throws Throwable
+ {
+ if (classInfo == null)
+ throw new IllegalArgumentException("Cannot execute constant lookup on null class info.");
+
+ return getConstant(classInfo, constantName);
+ }
+
+ public Object getConstant(String className, String constantName) throws Throwable
+ {
+ ClassInfo classInfo = configurator.getClassInfo(className, getClassLoader());
+ return getConstant(classInfo, constantName);
+ }
+
+ protected Object getConstant(ClassInfo classInfo, String constantName) throws Throwable
+ {
+ if (constantName == null)
+ throw new IllegalArgumentException("Null constant name");
+
+ FieldInfo field = classInfo.getDeclaredField(constantName);
+ if (field == null)
+ throw new IllegalArgumentException("No such constant: " + constantName + ", class info: " + classInfo);
+
+ return field.get(null);
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.access;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class FieldsBean
-{
- private String string;
-
- public void start()
- {
- if (string == null)
- throw new IllegalArgumentException("Strings should be set!");
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/FieldsBean.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.access;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class FieldsBean
+{
+ private String string;
+
+ public void start()
+ {
+ if (string == null)
+ throw new IllegalArgumentException("Strings should be set!");
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.demos.ioc.access;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public interface IConstants
-{
- public static final int X_INT_VALUE = 42;
-
- void setFoo(int foo);
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/IConstants.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.demos.ioc.access;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public interface IConstants
+{
+ public static final int X_INT_VALUE = 42;
+
+ void setFoo(int foo);
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,40 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.demos.ioc.access;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class XConstUser
-{
- private int x;
-
- public int getX()
- {
- return x;
- }
-
- public void setX(int x)
- {
- this.x = x;
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstUser.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.demos.ioc.access;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class XConstUser
+{
+ private int x;
+
+ public int getX()
+ {
+ return x;
+ }
+
+ public void setX(int x)
+ {
+ this.x = x;
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.demos.ioc.access;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class XConstants
-{
- public static final int X_INT_VALUE = 42;
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/access/XConstants.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.demos.ioc.access;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class XConstants
+{
+ public static final int X_INT_VALUE = 42;
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.annotations;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class AnnotatedExecutor implements Executor
-{
- private SimpleExecutor delegate;
-
- public AnnotatedExecutor(SimpleExecutor delegate)
- {
- this.delegate = delegate;
- }
-
- @StopWatchLog
- public void execute() throws Exception
- {
- delegate.execute();
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/AnnotatedExecutor.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.annotations;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AnnotatedExecutor implements Executor
+{
+ private SimpleExecutor delegate;
+
+ public AnnotatedExecutor(SimpleExecutor delegate)
+ {
+ this.delegate = delegate;
+ }
+
+ @StopWatchLog
+ public void execute() throws Exception
+ {
+ delegate.execute();
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,30 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.annotations;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface Executor
-{
- void execute() throws Exception;
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/Executor.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,30 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.annotations;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface Executor
+{
+ void execute() throws Exception;
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.annotations;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ExecutorInvoker
-{
- public void addExecutor(Executor executor) throws Exception
- {
- executor.execute();
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/ExecutorInvoker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.annotations;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ExecutorInvoker
+{
+ public void addExecutor(Executor executor) throws Exception
+ {
+ executor.execute();
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,37 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.annotations;
-
-import java.util.Random;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class SimpleExecutor implements Executor
-{
- private static Random random = new Random();
-
- public void execute() throws Exception
- {
- Thread.sleep(Math.abs(random.nextLong() % 101));
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/SimpleExecutor.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.annotations;
+
+import java.util.Random;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SimpleExecutor implements Executor
+{
+ private static Random random = new Random();
+
+ public void execute() throws Exception
+ {
+ Thread.sleep(Math.abs(random.nextLong() % 101));
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.annotations;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class StopWatchInterceptor implements Interceptor
-{
- private Logger log = Logger.getLogger("StopWatch");
-
- public String getName()
- {
- return "StopWatchInterceptor";
- }
-
- public Object invoke(Invocation invocation) throws Throwable
- {
- Object target = invocation.getTargetObject();
- long time = System.currentTimeMillis();
- log.info("Invocation [" + target + "] start: " + time);
- try
- {
- return invocation.invokeNext();
- }
- finally
- {
- log.info("Invocation [" + target + "] time: " + (System.currentTimeMillis() - time));
- }
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchInterceptor.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.annotations;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class StopWatchInterceptor implements Interceptor
+{
+ private Logger log = Logger.getLogger("StopWatch");
+
+ public String getName()
+ {
+ return "StopWatchInterceptor";
+ }
+
+ public Object invoke(Invocation invocation) throws Throwable
+ {
+ Object target = invocation.getTargetObject();
+ long time = System.currentTimeMillis();
+ log.info("Invocation [" + target + "] start: " + time);
+ try
+ {
+ return invocation.invokeNext();
+ }
+ finally
+ {
+ log.info("Invocation [" + target + "] time: " + (System.currentTimeMillis() - time));
+ }
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ElementType.METHOD, ElementType.TYPE})
-public @interface StopWatchLog
-{
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/annotations/StopWatchLog.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ElementType.METHOD, ElementType.TYPE})
+public @interface StopWatchLog
+{
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.autowire;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class Circle implements Shape
-{
- public String name()
- {
- return "circle";
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Circle.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.autowire;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class Circle implements Shape
+{
+ public String name()
+ {
+ return "circle";
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,30 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.autowire;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface Shape
-{
- String name();
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Shape.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,30 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.autowire;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface Shape
+{
+ String name();
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.autowire;
-
-import java.util.Set;
-
-import org.jboss.util.collection.CollectionsFactory;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ShapeHolder
-{
- private Set<Shape> shapes;
-
- public synchronized void addShape(Shape shape)
- {
- if (shapes == null)
- shapes = CollectionsFactory.createLazySet();
-
- shapes.add(shape);
- }
-
- public void check(int size)
- {
- if (shapes == null || size != shapes.size())
- throw new IllegalArgumentException("Illegal shapes size: " + shapes + " != " + size);
- }
-
- public void removeShape(Shape shape)
- {
- if (shapes != null)
- shapes.remove(shape);
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeHolder.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.autowire;
+
+import java.util.Set;
+
+import org.jboss.util.collection.CollectionsFactory;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ShapeHolder
+{
+ private Set<Shape> shapes;
+
+ public synchronized void addShape(Shape shape)
+ {
+ if (shapes == null)
+ shapes = CollectionsFactory.createLazySet();
+
+ shapes.add(shape);
+ }
+
+ public void check(int size)
+ {
+ if (shapes == null || size != shapes.size())
+ throw new IllegalArgumentException("Illegal shapes size: " + shapes + " != " + size);
+ }
+
+ public void removeShape(Shape shape)
+ {
+ if (shapes != null)
+ shapes.remove(shape);
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.autowire;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ShapeUser
-{
- private Shape shape;
-
- public ShapeUser(Shape shape)
- {
- this.shape = shape;
- }
-
- public Shape getShape()
- {
- return shape;
- }
-}
-
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapeUser.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.autowire;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ShapeUser
+{
+ private Shape shape;
+
+ public ShapeUser(Shape shape)
+ {
+ this.shape = shape;
+ }
+
+ public Shape getShape()
+ {
+ return shape;
+ }
+}
+
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,46 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.autowire;
-
-import org.jboss.beans.metadata.api.annotations.Constructor;
-import org.jboss.beans.metadata.api.annotations.Depends;
-import org.jboss.beans.metadata.api.annotations.Inject;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Depends({"Square", "Circle"})
-public class ShapesChecker
-{
- private ShapeHolder holder;
-
- @Constructor
- public ShapesChecker(@Inject(dependentState = "Installed") ShapeHolder holder)
- {
- this.holder = holder;
- }
-
- public void start()
- {
- holder.check(1);
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/ShapesChecker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,46 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.autowire;
+
+import org.jboss.beans.metadata.api.annotations.Constructor;
+import org.jboss.beans.metadata.api.annotations.Depends;
+import org.jboss.beans.metadata.api.annotations.Inject;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Depends({"Square", "Circle"})
+public class ShapesChecker
+{
+ private ShapeHolder holder;
+
+ @Constructor
+ public ShapesChecker(@Inject(dependentState = "Installed") ShapeHolder holder)
+ {
+ this.holder = holder;
+ }
+
+ public void start()
+ {
+ holder.check(1);
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.autowire;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class Square implements Shape
-{
- public String name()
- {
- return "square";
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/autowire/Square.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.autowire;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class Square implements Shape
+{
+ public String name()
+ {
+ return "square";
+ }
+}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/builder)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,42 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.builder;
-
-import org.jboss.kernel.Kernel;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class BuilderExample
-{
- private Kernel kernel;
-
- public void start(Kernel kernel)
- {
- this.kernel = kernel;
- }
-
- public Kernel getKernel()
- {
- return kernel;
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExample.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,42 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.builder;
+
+import org.jboss.kernel.Kernel;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class BuilderExample
+{
+ private Kernel kernel;
+
+ public void start(Kernel kernel)
+ {
+ this.kernel = kernel;
+ }
+
+ public Kernel getKernel()
+ {
+ return kernel;
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,45 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.builder;
-
-import org.jboss.kernel.Kernel;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class BuilderExampleHolder
-{
- private BuilderExample example;
-
- public BuilderExampleHolder(BuilderExample example)
- {
- this.example = example;
- Kernel kernel = example.getKernel();
- if (kernel == null)
- throw new IllegalArgumentException("Kernel should be setup in BuilderExample: " + example);
- }
-
- public BuilderExample getExample()
- {
- return example;
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderExampleHolder.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,45 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.builder;
+
+import org.jboss.kernel.Kernel;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class BuilderExampleHolder
+{
+ private BuilderExample example;
+
+ public BuilderExampleHolder(BuilderExample example)
+ {
+ this.example = example;
+ Kernel kernel = example.getKernel();
+ if (kernel == null)
+ throw new IllegalArgumentException("Kernel should be setup in BuilderExample: " + example);
+ }
+
+ public BuilderExample getExample()
+ {
+ return example;
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.builder;
-
-import org.jboss.beans.metadata.api.annotations.Constructor;
-import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
-import org.jboss.kernel.spi.dependency.KernelController;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class BuilderUtil
-{
- private KernelController controller;
-
- @Constructor
- public BuilderUtil(@Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME) KernelController controller)
- {
- this.controller = controller;
- }
-
- public void create() throws Throwable
- {
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("BUExample", BuilderExample.class.getName());
- builder.addStartParameter(Kernel.class.getName(), builder.createInject(KernelConstants.KERNEL_NAME));
- controller.install(builder.getBeanMetaData());
- }
-
- public void destroy()
- {
- controller.uninstall("BUExample");
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/builder/BuilderUtil.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.builder;
+
+import org.jboss.beans.metadata.api.annotations.Constructor;
+import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
+import org.jboss.kernel.spi.dependency.KernelController;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class BuilderUtil
+{
+ private KernelController controller;
+
+ @Constructor
+ public BuilderUtil(@Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME) KernelController controller)
+ {
+ this.controller = controller;
+ }
+
+ public void create() throws Throwable
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("BUExample", BuilderExample.class.getName());
+ builder.addStartParameter(Kernel.class.getName(), builder.createInject(KernelConstants.KERNEL_NAME));
+ controller.install(builder.getBeanMetaData());
+ }
+
+ public void destroy()
+ {
+ controller.uninstall("BUExample");
+ }
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.classloader;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class CustomBean
-{
- public void invoke(String className) throws Exception
- {
- ClassLoader cl = getClass().getClassLoader();
- cl.loadClass(className);
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomBean.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,34 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.classloader;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class CustomBean
+{
+ public void invoke(String className) throws Exception
+ {
+ ClassLoader cl = getClass().getClassLoader();
+ cl.loadClass(className);
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.classloader;
-
-import java.util.regex.Pattern;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class CustomClassLoader extends ClassLoader
-{
- private Pattern pattern;
-
- public CustomClassLoader(ClassLoader parent)
- {
- super(parent);
- }
-
- public Class<?> loadClass(String name) throws ClassNotFoundException
- {
- if (pattern == null || pattern.matcher(name).matches())
- return super.loadClass(name);
- else
- throw new ClassNotFoundException("Name '" + name + "' doesn't match pattern: " + pattern);
- }
-
- public void setPattern(String regexp)
- {
- pattern = Pattern.compile(regexp);
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/classloader/CustomClassLoader.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.classloader;
+
+import java.util.regex.Pattern;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class CustomClassLoader extends ClassLoader
+{
+ private Pattern pattern;
+
+ public CustomClassLoader(ClassLoader parent)
+ {
+ super(parent);
+ }
+
+ public Class<?> loadClass(String name) throws ClassNotFoundException
+ {
+ if (pattern == null || pattern.matcher(name).matches())
+ return super.loadClass(name);
+ else
+ throw new ClassNotFoundException("Name '" + name + "' doesn't match pattern: " + pattern);
+ }
+
+ public void setPattern(String regexp)
+ {
+ pattern = Pattern.compile(regexp);
+ }
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,35 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.demandsupply;
-
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class AdvancedTMSupplyer
-{
- public void start(Properties properties)
- {
- MockTransactionManager.setup(properties);
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/AdvancedTMSupplyer.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.demandsupply;
+
+import java.util.Properties;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AdvancedTMSupplyer
+{
+ public void start(Properties properties)
+ {
+ MockTransactionManager.setup(properties);
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.demandsupply;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class MockTransactionManager
-{
- private static MockTransactionManager singleton;
- private Map<Object, Object> properties = new HashMap<Object, Object>();
-
- private MockTransactionManager()
- {
- }
-
- public synchronized static void setup(Map<Object, Object> properties)
- {
- System.out.println("Properties: " + properties);
- if (singleton == null)
- singleton = new MockTransactionManager();
- if (properties != null)
- singleton.properties.putAll(properties);
- }
-
- public static MockTransactionManager getInstance()
- {
- return singleton;
- }
-
- public Map<Object, Object> getProperties()
- {
- return properties;
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/MockTransactionManager.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.demandsupply;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MockTransactionManager
+{
+ private static MockTransactionManager singleton;
+ private Map<Object, Object> properties = new HashMap<Object, Object>();
+
+ private MockTransactionManager()
+ {
+ }
+
+ public synchronized static void setup(Map<Object, Object> properties)
+ {
+ System.out.println("Properties: " + properties);
+ if (singleton == null)
+ singleton = new MockTransactionManager();
+ if (properties != null)
+ singleton.properties.putAll(properties);
+ }
+
+ public static MockTransactionManager getInstance()
+ {
+ return singleton;
+ }
+
+ public Map<Object, Object> getProperties()
+ {
+ return properties;
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.demandsupply;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class SimpleTMSupplyer
-{
- public void start()
- {
- MockTransactionManager.setup(System.getProperties());
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/SimpleTMSupplyer.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.demandsupply;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SimpleTMSupplyer
+{
+ public void start()
+ {
+ MockTransactionManager.setup(System.getProperties());
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,35 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.demandsupply;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class TMDemander
-{
- public void create()
- {
- MockTransactionManager tm = MockTransactionManager.getInstance();
- if (tm == null)
- throw new IllegalArgumentException("Demanding TM - should be setup!");
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/demandsupply/TMDemander.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.demandsupply;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class TMDemander
+{
+ public void create()
+ {
+ MockTransactionManager tm = MockTransactionManager.getInstance();
+ if (tm == null)
+ throw new IllegalArgumentException("Demanding TM - should be setup!");
+ }
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,92 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.factory;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.HashSet;
-
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
-import org.jboss.kernel.spi.config.KernelConfigurator;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class EnhancedBeanFactory extends GenericBeanFactory
-{
- public EnhancedBeanFactory(KernelConfigurator configurator)
- {
- super(configurator);
- }
-
- public Object createBean() throws Throwable
- {
- Object bean = super.createBean();
- Class<?> clazz = bean.getClass();
- if (clazz.isAnnotationPresent(SetterProxy.class))
- {
- Set<Class> interfaces = new HashSet<Class>();
- addInterfaces(clazz, interfaces);
-
- return Proxy.newProxyInstance(
- clazz.getClassLoader(),
- interfaces.toArray(new Class<?>[interfaces.size()]),
- new SetterInterceptor(bean)
- );
- }
- else
- {
- return bean;
- }
- }
-
- protected static void addInterfaces(Class<?> clazz, Set<Class> interfaces)
- {
- if (clazz == null)
- return;
-
- interfaces.addAll(Arrays.asList(clazz.getInterfaces()));
- addInterfaces(clazz.getSuperclass(), interfaces);
- }
-
- private class SetterInterceptor implements InvocationHandler
- {
- private Object target;
-
- private SetterInterceptor(Object target)
- {
- this.target = target;
- }
-
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
- {
- String methodName = method.getName();
- if (methodName.startsWith("set"))
- throw new IllegalArgumentException("Cannot invoke setters.");
-
- return method.invoke(target, args);
- }
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/EnhancedBeanFactory.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,92 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.factory;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.Set;
+import java.util.HashSet;
+
+import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
+import org.jboss.kernel.spi.config.KernelConfigurator;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class EnhancedBeanFactory extends GenericBeanFactory
+{
+ public EnhancedBeanFactory(KernelConfigurator configurator)
+ {
+ super(configurator);
+ }
+
+ public Object createBean() throws Throwable
+ {
+ Object bean = super.createBean();
+ Class<?> clazz = bean.getClass();
+ if (clazz.isAnnotationPresent(SetterProxy.class))
+ {
+ Set<Class> interfaces = new HashSet<Class>();
+ addInterfaces(clazz, interfaces);
+
+ return Proxy.newProxyInstance(
+ clazz.getClassLoader(),
+ interfaces.toArray(new Class<?>[interfaces.size()]),
+ new SetterInterceptor(bean)
+ );
+ }
+ else
+ {
+ return bean;
+ }
+ }
+
+ protected static void addInterfaces(Class<?> clazz, Set<Class> interfaces)
+ {
+ if (clazz == null)
+ return;
+
+ interfaces.addAll(Arrays.asList(clazz.getInterfaces()));
+ addInterfaces(clazz.getSuperclass(), interfaces);
+ }
+
+ private class SetterInterceptor implements InvocationHandler
+ {
+ private Object target;
+
+ private SetterInterceptor(Object target)
+ {
+ this.target = target;
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ String methodName = method.getName();
+ if (methodName.startsWith("set"))
+ throw new IllegalArgumentException("Cannot invoke setters.");
+
+ return method.invoke(target, args);
+ }
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.factory;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class Prototype implements ValueInvoker
-{
- private Object value;
-
- public Prototype()
- {
- }
-
- public Prototype(Object value)
- {
- this.value = value;
- }
-
- public Object invoke()
- {
- return value;
- }
-
- public void setValue(Object value)
- {
- this.value = value;
- }
-
- public Object getValue()
- {
- return value;
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/Prototype.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.factory;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class Prototype implements ValueInvoker
+{
+ private Object value;
+
+ public Prototype()
+ {
+ }
+
+ public Prototype(Object value)
+ {
+ this.value = value;
+ }
+
+ public Object invoke()
+ {
+ return value;
+ }
+
+ public void setValue(Object value)
+ {
+ this.value = value;
+ }
+
+ public Object getValue()
+ {
+ return value;
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,68 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.factory;
-
-import org.jboss.beans.metadata.spi.factory.BeanFactory;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class PrototypeCreator
-{
- private BeanFactory bfDefault;
- private BeanFactory enhanced;
- private BeanFactory proxied;
-
- public void create() throws Throwable
- {
- ValueInvoker vi1 = (ValueInvoker)bfDefault.createBean();
- vi1.setValue("default");
-
- ValueInvoker vi2 = (ValueInvoker)enhanced.createBean();
- vi2.setValue("enhanced");
-
- ValueInvoker vi3 = (ValueInvoker)proxied.createBean();
- try
- {
- vi3.setValue("default");
- throw new Error("Should not be here.");
- }
- catch (Exception ignored)
- {
- }
- }
-
- public void setDefault(BeanFactory bfDefault)
- {
- this.bfDefault = bfDefault;
- }
-
- public void setEnhanced(BeanFactory enhanced)
- {
- this.enhanced = enhanced;
- }
-
- public void setProxied(BeanFactory proxied)
- {
- this.proxied = proxied;
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/PrototypeCreator.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,68 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.factory;
+
+import org.jboss.beans.metadata.spi.factory.BeanFactory;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class PrototypeCreator
+{
+ private BeanFactory bfDefault;
+ private BeanFactory enhanced;
+ private BeanFactory proxied;
+
+ public void create() throws Throwable
+ {
+ ValueInvoker vi1 = (ValueInvoker)bfDefault.createBean();
+ vi1.setValue("default");
+
+ ValueInvoker vi2 = (ValueInvoker)enhanced.createBean();
+ vi2.setValue("enhanced");
+
+ ValueInvoker vi3 = (ValueInvoker)proxied.createBean();
+ try
+ {
+ vi3.setValue("default");
+ throw new Error("Should not be here.");
+ }
+ catch (Exception ignored)
+ {
+ }
+ }
+
+ public void setDefault(BeanFactory bfDefault)
+ {
+ this.bfDefault = bfDefault;
+ }
+
+ public void setEnhanced(BeanFactory enhanced)
+ {
+ this.enhanced = enhanced;
+ }
+
+ public void setProxied(BeanFactory proxied)
+ {
+ this.proxied = proxied;
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,36 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.factory;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Target(ElementType.TYPE)
- at Retention(RetentionPolicy.RUNTIME)
-public @interface SetterProxy
-{
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/SetterProxy.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.factory;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Target(ElementType.TYPE)
+ at Retention(RetentionPolicy.RUNTIME)
+public @interface SetterProxy
+{
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,38 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.factory;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at SetterProxy
-public class UnmodifiablePrototype extends Prototype
-{
- public UnmodifiablePrototype()
- {
- }
-
- public UnmodifiablePrototype(Object value)
- {
- super(value);
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/UnmodifiablePrototype.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,38 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.factory;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at SetterProxy
+public class UnmodifiablePrototype extends Prototype
+{
+ public UnmodifiablePrototype()
+ {
+ }
+
+ public UnmodifiablePrototype(Object value)
+ {
+ super(value);
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.factory;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public interface ValueInvoker
-{
- Object invoke();
-
- void setValue(Object value);
-
- Object getValue();
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/factory/ValueInvoker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,34 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.factory;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface ValueInvoker
+{
+ Object invoke();
+
+ void setValue(Object value);
+
+ Object getValue();
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/install)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.install;
-
-import java.util.Map;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class RegistryChecker
-{
- private RepositoryManager manager;
- private int size;
-
- public RegistryChecker(RepositoryManager manager)
- {
- this.manager = manager;
- }
-
- public void setSize(int size)
- {
- this.size = size;
- }
-
- public void start()
- {
- if (manager == null)
- throw new IllegalArgumentException("Null manager!");
- Map<String,Object> repository = manager.getRepository();
- if (repository == null)
- throw new IllegalArgumentException("Null repository");
- if (size != repository.size())
- throw new IllegalArgumentException("Illegal repository size: " + repository);
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RegistryChecker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.install;
+
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class RegistryChecker
+{
+ private RepositoryManager manager;
+ private int size;
+
+ public RegistryChecker(RepositoryManager manager)
+ {
+ this.manager = manager;
+ }
+
+ public void setSize(int size)
+ {
+ this.size = size;
+ }
+
+ public void start()
+ {
+ if (manager == null)
+ throw new IllegalArgumentException("Null manager!");
+ Map<String,Object> repository = manager.getRepository();
+ if (repository == null)
+ throw new IllegalArgumentException("Null repository");
+ if (size != repository.size())
+ throw new IllegalArgumentException("Illegal repository size: " + repository);
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,48 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.install;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class RepositoryManager
-{
- private Map<String, Object> repository = new HashMap<String, Object>();
-
- public void addEntry(String name, Object instance)
- {
- repository.put(name, instance);
- }
-
- public Map<String, Object> getRepository()
- {
- return repository;
- }
-
- public void removeEntry(String name)
- {
- repository.remove(name);
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/RepositoryManager.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,48 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.install;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class RepositoryManager
+{
+ private Map<String, Object> repository = new HashMap<String, Object>();
+
+ public void addEntry(String name, Object instance)
+ {
+ repository.put(name, instance);
+ }
+
+ public Map<String, Object> getRepository()
+ {
+ return repository;
+ }
+
+ public void removeEntry(String name)
+ {
+ repository.remove(name);
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.install;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class SimpleEntry
-{
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/install/SimpleEntry.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.install;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SimpleEntry
+{
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,55 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.lifecycle;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class FullLifecycleBean
-{
- private int state;
-
- public void create()
- {
- state += 1;
- }
-
- public void start()
- {
- state += 2;
- }
-
- public int getState()
- {
- return state;
- }
-
- public void stop()
- {
- state -= 2;
- }
-
- public void destroy()
- {
- state -= 1;
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/FullLifecycleBean.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,55 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.lifecycle;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class FullLifecycleBean
+{
+ private int state;
+
+ public void create()
+ {
+ state += 1;
+ }
+
+ public void start()
+ {
+ state += 2;
+ }
+
+ public int getState()
+ {
+ return state;
+ }
+
+ public void stop()
+ {
+ state -= 2;
+ }
+
+ public void destroy()
+ {
+ state -= 1;
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,61 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.lifecycle;
-
-import java.util.Set;
-
-import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.api.annotations.Start;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class LifecycleChecker
-{
- private KernelController controller;
-
- @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME)
- public void setController(KernelController controller)
- {
- this.controller = controller;
- }
-
- @Start
- public void checkLifecycle()
- {
- Set<KernelControllerContext> contexts = controller.getInstantiatedContexts(FullLifecycleBean.class);
- if (contexts != null && contexts.isEmpty() == false)
- {
- for (KernelControllerContext context : contexts)
- {
- String name = context.getName().toString();
- int state = Integer.parseInt(name.split("-")[1]);
- FullLifecycleBean bean = (FullLifecycleBean)context.getTarget();
- if (state != bean.getState())
- throw new IllegalArgumentException("Wrong state: " + context);
- }
- }
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,61 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.lifecycle;
+
+import java.util.Set;
+
+import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.beans.metadata.api.annotations.Start;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class LifecycleChecker
+{
+ private KernelController controller;
+
+ @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME)
+ public void setController(KernelController controller)
+ {
+ this.controller = controller;
+ }
+
+ @Start
+ public void checkLifecycle()
+ {
+ Set<KernelControllerContext> contexts = controller.getInstantiatedContexts(FullLifecycleBean.class);
+ if (contexts != null && contexts.isEmpty() == false)
+ {
+ for (KernelControllerContext context : contexts)
+ {
+ String name = context.getName().toString();
+ int state = Integer.parseInt(name.split("-")[1]);
+ FullLifecycleBean bean = (FullLifecycleBean)context.getTarget();
+ if (state != bean.getState())
+ throw new IllegalArgumentException("Wrong state: " + context);
+ }
+ }
+ }
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.mode;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ManualService
-{
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualService.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.mode;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ManualService
+{
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,63 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.mode;
-
-import org.jboss.beans.metadata.api.annotations.Constructor;
-import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ManualServiceUser
-{
- private static final String MS_NAME = "ManualService";
- private Controller controller;
-
- @Constructor
- public ManualServiceUser(@Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME) Controller controller)
- {
- this.controller = controller;
- }
-
- public void start(ControllerContext mc) throws Throwable
- {
- if (ControllerState.NOT_INSTALLED.equals(mc.getState()) == false)
- throw new IllegalArgumentException(MS_NAME + " should be NOT installed.");
-
- // get un-wrapped ControllerContext
- mc = controller.getContext(mc.getName(), null);
- controller.change(mc, ControllerState.INSTALLED);
-
- if (ControllerState.INSTALLED.equals(mc.getState()) == false)
- throw new IllegalArgumentException(MS_NAME + " should BE installed.");
- }
-
- public void stop() throws Throwable
- {
- ControllerContext mc = controller.getInstalledContext(MS_NAME);
- controller.change(mc, ControllerState.NOT_INSTALLED);
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/ManualServiceUser.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,63 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.mode;
+
+import org.jboss.beans.metadata.api.annotations.Constructor;
+import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ManualServiceUser
+{
+ private static final String MS_NAME = "ManualService";
+ private Controller controller;
+
+ @Constructor
+ public ManualServiceUser(@Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME) Controller controller)
+ {
+ this.controller = controller;
+ }
+
+ public void start(ControllerContext mc) throws Throwable
+ {
+ if (ControllerState.NOT_INSTALLED.equals(mc.getState()) == false)
+ throw new IllegalArgumentException(MS_NAME + " should be NOT installed.");
+
+ // get un-wrapped ControllerContext
+ mc = controller.getContext(mc.getName(), null);
+ controller.change(mc, ControllerState.INSTALLED);
+
+ if (ControllerState.INSTALLED.equals(mc.getState()) == false)
+ throw new IllegalArgumentException(MS_NAME + " should BE installed.");
+ }
+
+ public void stop() throws Throwable
+ {
+ ControllerContext mc = controller.getInstalledContext(MS_NAME);
+ controller.change(mc, ControllerState.NOT_INSTALLED);
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.mode;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class OptionalService
-{
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalService.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,29 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.mode;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class OptionalService
+{
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.mode;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class OptionalServiceCaller
-{
- private OptionalService service;
-
- public OptionalServiceCaller(OptionalService service)
- {
- this.service = service;
- }
-
- public OptionalService getService()
- {
- return service;
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceCaller.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.mode;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class OptionalServiceCaller
+{
+ private OptionalService service;
+
+ public OptionalServiceCaller(OptionalService service)
+ {
+ this.service = service;
+ }
+
+ public OptionalService getService()
+ {
+ return service;
+ }
+}
\ No newline at end of file
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,75 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.mode;
-
-import org.jboss.beans.metadata.api.annotations.Constructor;
-import org.jboss.beans.metadata.api.annotations.Inject;
-import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.DependencyInfo;
-import org.jboss.dependency.plugins.AbstractDependencyItem;
-import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
-import org.jboss.kernel.spi.dependency.KernelController;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class OptionalServiceUser
-{
- private static final String OS_NAME = "OptionalService";
- private KernelController controller;
-
- @Constructor
- public OptionalServiceUser(@Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME) KernelController controller)
- {
- this.controller = controller;
- }
-
- public void create() throws Throwable
- {
- ControllerContext os = controller.getInstalledContext(OS_NAME);
- if (os != null && os.getState().equals(ControllerState.INSTALLED))
- throw new IllegalArgumentException("Optional service should NOT be installed.");
-
- // add dependency, so that we wait till OSCaller is instantiated - hence invoking OptionalService
- ControllerContext thisContext = controller.getContext(OS_NAME + "User", null);
- DependencyInfo di = thisContext.getDependencyInfo();
- di.addIDependOn(new AbstractDependencyItem(thisContext.getName(), "OSCaller", ControllerState.START, ControllerState.INSTANTIATED));
-
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("OSCaller", OptionalServiceCaller.class.getName());
- builder.addConstructorParameter(OptionalService.class.getName(), builder.createInject(OS_NAME));
- controller.install(builder.getBeanMetaData());
- }
-
- public void start()
- {
- ControllerContext os = controller.getInstalledContext(OS_NAME);
- if (os == null || os.getState().equals(ControllerState.INSTALLED) == false)
- throw new IllegalArgumentException("Optional service should BE installed.");
- }
-
- public void destroy()
- {
- controller.uninstall("OSCaller");
- }
-}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/mode/OptionalServiceUser.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,75 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.mode;
+
+import org.jboss.beans.metadata.api.annotations.Constructor;
+import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
+import org.jboss.kernel.spi.dependency.KernelController;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class OptionalServiceUser
+{
+ private static final String OS_NAME = "OptionalService";
+ private KernelController controller;
+
+ @Constructor
+ public OptionalServiceUser(@Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME) KernelController controller)
+ {
+ this.controller = controller;
+ }
+
+ public void create() throws Throwable
+ {
+ ControllerContext os = controller.getInstalledContext(OS_NAME);
+ if (os != null && os.getState().equals(ControllerState.INSTALLED))
+ throw new IllegalArgumentException("Optional service should NOT be installed.");
+
+ // add dependency, so that we wait till OSCaller is instantiated - hence invoking OptionalService
+ ControllerContext thisContext = controller.getContext(OS_NAME + "User", null);
+ DependencyInfo di = thisContext.getDependencyInfo();
+ di.addIDependOn(new AbstractDependencyItem(thisContext.getName(), "OSCaller", ControllerState.START, ControllerState.INSTANTIATED));
+
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("OSCaller", OptionalServiceCaller.class.getName());
+ builder.addConstructorParameter(OptionalService.class.getName(), builder.createInject(OS_NAME));
+ controller.install(builder.getBeanMetaData());
+ }
+
+ public void start()
+ {
+ ControllerContext os = controller.getInstalledContext(OS_NAME);
+ if (os == null || os.getState().equals(ControllerState.INSTALLED) == false)
+ throw new IllegalArgumentException("Optional service should BE installed.");
+ }
+
+ public void destroy()
+ {
+ controller.uninstall("OSCaller");
+ }
+}
\ No newline at end of file
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/vf)
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.vf;
-
-import java.util.Map;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class PortBindingManager
-{
- private Map<String, Integer> bindings;
-
- public PortBindingManager(Map<String, Integer> bindings)
- {
- this.bindings = bindings;
- }
-
- public Integer getPort(String key)
- {
- return getPort(key, null);
- }
-
- public Integer getPort(String key, Integer defaultValue)
- {
- if (bindings == null)
- return defaultValue;
-
- Integer value = bindings.get(key);
- if (value != null)
- return value;
-
- if (defaultValue != null)
- bindings.put(key, defaultValue);
-
- return defaultValue;
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortBindingManager.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.vf;
+
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class PortBindingManager
+{
+ private Map<String, Integer> bindings;
+
+ public PortBindingManager(Map<String, Integer> bindings)
+ {
+ this.bindings = bindings;
+ }
+
+ public Integer getPort(String key)
+ {
+ return getPort(key, null);
+ }
+
+ public Integer getPort(String key, Integer defaultValue)
+ {
+ if (bindings == null)
+ return defaultValue;
+
+ Integer value = bindings.get(key);
+ if (value != null)
+ return value;
+
+ if (defaultValue != null)
+ bindings.put(key, defaultValue);
+
+ return defaultValue;
+ }
+}
Deleted: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -1,67 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.demos.ioc.vf;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class PortsConfig
-{
- private Integer http;
- private Integer ftp;
- private Integer mail;
- private Integer ssh;
-
- public void setHttp(Integer http)
- {
- this.http = http;
- }
-
- public void setFtp(Integer ftp)
- {
- this.ftp = ftp;
- }
-
- public void setMail(Integer mail)
- {
- this.mail = mail;
- }
-
- public void setSsh(Integer ssh)
- {
- this.ssh = ssh;
- }
-
- public void start()
- {
- check(http, 80);
- check(ftp, 21);
- check(mail, 25);
- check(ssh, 22);
- }
-
- protected void check(Integer value, Integer expected)
- {
- if (expected.equals(value) == false)
- throw new IllegalArgumentException("Illegal value: " + value + ", expecting: " + expected);
- }
-}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/java/org/jboss/demos/ioc/vf/PortsConfig.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,67 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.demos.ioc.vf;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class PortsConfig
+{
+ private Integer http;
+ private Integer ftp;
+ private Integer mail;
+ private Integer ssh;
+
+ public void setHttp(Integer http)
+ {
+ this.http = http;
+ }
+
+ public void setFtp(Integer ftp)
+ {
+ this.ftp = ftp;
+ }
+
+ public void setMail(Integer mail)
+ {
+ this.mail = mail;
+ }
+
+ public void setSsh(Integer ssh)
+ {
+ this.ssh = ssh;
+ }
+
+ public void start()
+ {
+ check(http, 80);
+ check(ftp, 21);
+ check(mail, 25);
+ check(ssh, 22);
+ }
+
+ protected void check(Integer value, Integer expected)
+ {
+ if (expected.equals(value) == false)
+ throw new IllegalArgumentException("Illegal value: " + value + ", expecting: " + expected);
+ }
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/access-mode-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/access-mode-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/access-mode-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/access-mode-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,23 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="FieldsBean" class="org.jboss.demos.ioc.access.FieldsBean" access-mode="ALL">
+ <property name="string">InternalString</property>
+ </bean>
+
+ <bean name="XConstants" class="org.jboss.demos.ioc.access.XConstants" access-mode="FIELDS"/>
+
+ <bean name="XConstUser1" class="org.jboss.demos.ioc.access.XConstUser">
+ <property name="x"><inject bean="XConstants" property="X_INT_VALUE"/></property>
+ </bean>
+
+ <bean name="ConstantsProvider" class="org.jboss.demos.ioc.access.ConstantsProvider">
+ <constructor>
+ <parameter>org.jboss.demos.ioc.access.IConstants</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="XConstUser2" class="org.jboss.demos.ioc.access.XConstUser">
+ <property name="x"><value-factory bean="ConstantsProvider" method="getConstant" parameter="X_INT_VALUE"/></property>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/aliases-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/aliases-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/aliases-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/aliases-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,10 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="SimpleName" class="java.lang.Object">
+ <alias>SimpleAlias</alias>
+ <alias replace="true">${some.system.property}</alias>
+ <alias class="java.lang.Integer">12345</alias>
+ <alias><javabean xmlns="urn:jboss:javabean:2.0" class="org.jboss.demos.bootstrap.Main"/></alias>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/annotations-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/annotations-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/annotations-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/annotations-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,23 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <interceptor xmlns="urn:jboss:aop-beans:1.0" name="StopWatchInterceptor" class="org.jboss.demos.ioc.annotations.StopWatchInterceptor"/>
+
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.demos.ioc.annotations.StopWatchLog->*(..)) OR execution(* *->@org.jboss.demos.ioc.annotations.StopWatchLog(..))">
+ <interceptor-ref name="StopWatchInterceptor"/>
+ </bind>
+
+ <bean name="AnnotatedExecutor" class="org.jboss.demos.ioc.annotations.AnnotatedExecutor">
+ <constructor>
+ <parameter><bean class="org.jboss.demos.ioc.annotations.SimpleExecutor"/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="SimpleExecutor" class="org.jboss.demos.ioc.annotations.SimpleExecutor">
+ <annotation>@org.jboss.demos.ioc.annotations.StopWatchLog</annotation>
+ </bean>
+
+ <bean name="ExecutorInvoker" class="org.jboss.demos.ioc.annotations.ExecutorInvoker">
+ <incallback method="addExecutor"/>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/autowire-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/autowire-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/autowire-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/autowire-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,19 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Square" class="org.jboss.demos.ioc.autowire.Square" autowire-candidate="false"/>
+ <bean name="Circle" class="org.jboss.demos.ioc.autowire.Circle"/>
+
+ <bean name="ShapeUser" class="org.jboss.demos.ioc.autowire.ShapeUser">
+ <constructor>
+ <parameter><inject/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="ShapeHolder" class="org.jboss.demos.ioc.autowire.ShapeHolder">
+ <incallback method="addShape"/>
+ <uncallback method="removeShape"/>
+ </bean>
+
+ <bean name="ShapeChecker" class="org.jboss.demos.ioc.autowire.ShapesChecker"/>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/bean-factory-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/bean-factory-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/bean-factory-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/bean-factory-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,23 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Object" class="java.lang.Object"/>
+
+ <beanfactory name="DefaultPrototype" class="org.jboss.demos.ioc.factory.Prototype">
+ <property name="value"><inject bean="Object"/></property>
+ </beanfactory>
+
+ <beanfactory name="EnhancedPrototype" class="org.jboss.demos.ioc.factory.Prototype" factoryClass="org.jboss.demos.ioc.factory.EnhancedBeanFactory">
+ <property name="value"><inject bean="Object"/></property>
+ </beanfactory>
+
+ <beanfactory name="ProxiedPrototype" class="org.jboss.demos.ioc.factory.UnmodifiablePrototype" factoryClass="org.jboss.demos.ioc.factory.EnhancedBeanFactory">
+ <property name="value"><inject bean="Object"/></property>
+ </beanfactory>
+
+ <bean name="PrototypeCreator" class="org.jboss.demos.ioc.factory.PrototypeCreator">
+ <property name="default"><inject bean="DefaultPrototype"/></property>
+ <property name="enhanced"><inject bean="EnhancedPrototype"/></property>
+ <property name="proxied"><inject bean="ProxiedPrototype"/></property>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/builder-util-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/builder-util-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/builder-util-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/builder-util-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,11 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="BuilderUtil" class="org.jboss.demos.ioc.builder.BuilderUtil"/>
+
+ <bean name="BuilderExampleHolder" class="org.jboss.demos.ioc.builder.BuilderExampleHolder">
+ <constructor>
+ <parameter><inject bean="BUExample"/></parameter>
+ </constructor>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/classloader-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/classloader-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/classloader-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/classloader-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,20 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="custom-classloader:0.0.0"/></classloader>
+
+ <classloader name="custom-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"/>
+
+ <bean name="CustomCL" class="org.jboss.demos.ioc.classloader.CustomClassLoader">
+ <constructor>
+ <parameter><inject bean="custom-classloader:0.0.0"/></parameter>
+ </constructor>
+ <property name="pattern">org\.jboss\.demos\.ioc\..+</property>
+ </bean>
+
+ <bean name="CB1" class="org.jboss.demos.ioc.classloader.CustomBean"/>
+
+ <bean name="CB2" class="org.jboss.demos.ioc.classloader.CustomBean">
+ <classloader><inject bean="CustomCL"/></classloader>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/controller-mode-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/controller-mode-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/controller-mode-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/controller-mode-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,15 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="OptionalService" class="org.jboss.demos.ioc.mode.OptionalService" mode="On Demand"/>
+
+ <bean name="OptionalServiceUser" class="org.jboss.demos.ioc.mode.OptionalServiceUser"/>
+
+ <bean name="ManualService" class="org.jboss.demos.ioc.mode.ManualService" mode="Manual"/>
+
+ <bean name="ManualServiceUser" class="org.jboss.demos.ioc.mode.ManualServiceUser">
+ <start>
+ <parameter><inject bean="ManualService" fromContext="context" state="Not Installed"/></parameter>
+ </start>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/demand-supply-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/demand-supply-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/demand-supply-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/demand-supply-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,16 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="TMDemand" class="org.jboss.demos.ioc.demandsupply.TMDemander">
+ <demand>TM</demand>
+ </bean>
+
+ <bean name="SimpleTMSupply" class="org.jboss.demos.ioc.demandsupply.SimpleTMSupplyer">
+ <supply>TM</supply>
+ </bean>
+
+ <bean name="AdvancedTMSupply" class="org.jboss.demos.ioc.demandsupply.AdvancedTMSupplyer">
+ <start><parameter><null/></parameter></start>
+ <supply>TM</supply>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/install-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/install-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/install-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/install-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,30 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="RepositoryManager" class="org.jboss.demos.ioc.install.RepositoryManager">
+ <install method="addEntry">
+ <parameter><inject fromContext="name"/></parameter>
+ <parameter><this/></parameter>
+ </install>
+ <uninstall method="removeEntry">
+ <parameter><inject fromContext="name"/></parameter>
+ </uninstall>
+ </bean>
+
+ <bean name="Entry" class="org.jboss.demos.ioc.install.SimpleEntry">
+ <install bean="RepositoryManager" method="addEntry" state="Instantiated">
+ <parameter><inject fromContext="name"/></parameter>
+ <parameter><this/></parameter>
+ </install>
+ <uninstall bean="RepositoryManager" method="removeEntry" state="Configured">
+ <parameter><inject fromContext="name"/></parameter>
+ </uninstall>
+ </bean>
+
+ <bean name="RC" class="org.jboss.demos.ioc.install.RegistryChecker">
+ <constructor>
+ <parameter><inject/></parameter>
+ </constructor>
+ <property name="size">2</property>
+ </bean>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/lifecycle-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/lifecycle-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/lifecycle-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/lifecycle-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,15 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="FullLifecycleBean-3" class="org.jboss.demos.ioc.lifecycle.FullLifecycleBean"/>
+
+ <bean name="FullLifecycleBean-2" class="org.jboss.demos.ioc.lifecycle.FullLifecycleBean">
+ <create ignored="true"/>
+ </bean>
+
+ <bean name="FullLifecycleBean-1" class="org.jboss.demos.ioc.lifecycle.FullLifecycleBean">
+ <start ignored="true"/>
+ </bean>
+
+ <bean name="LifecycleChecker" class="org.jboss.demos.ioc.lifecycle.LifecycleChecker"/>
+
+</deployment>
Copied: projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/value-factory-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/ioc/src/main/resources/META-INF/value-factory-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/value-factory-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/ioc/src/main/resources/META-INF/value-factory-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,37 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="Binding" class="org.jboss.demos.ioc.vf.PortBindingManager">
+ <constructor>
+ <parameter>
+ <map keyClass="java.lang.String" valueClass="java.lang.Integer">
+ <entry>
+ <key>http</key>
+ <value>80</value>
+ </entry>
+ <entry>
+ <key>ssh</key>
+ <value>22</value>
+ </entry>
+ </map>
+ </parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortsConfig" class="org.jboss.demos.ioc.vf.PortsConfig">
+ <property name="http"><value-factory bean="Binding" method="getPort" parameter="http"/></property>
+ <property name="ssh"><value-factory bean="Binding" method="getPort" parameter="ssh"/></property>
+ <property name="ftp">
+ <value-factory bean="Binding" method="getPort">
+ <parameter>ftp</parameter>
+ <parameter>21</parameter>
+ </value-factory>
+ </property>
+ <property name="mail">
+ <value-factory bean="Binding" method="getPort">
+ <parameter>mail</parameter>
+ <parameter>25</parameter>
+ </value-factory>
+ </property>
+ </bean>
+
+</deployment>
Modified: projects/demos/microcontainer/branches/DZone_1_0/jmx/pom.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/jmx/pom.xml 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/jmx/pom.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -73,12 +73,20 @@
<artifactId>jboss-aop</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-jmx</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
+ <artifactId>jboss-as-system-jmx</artifactId>
</dependency>
</dependencies>
Modified: projects/demos/microcontainer/branches/DZone_1_0/jmx/src/main/java/org/jboss/demos/bootstrap/jmx/JMXMain.java
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/jmx/src/main/java/org/jboss/demos/bootstrap/jmx/JMXMain.java 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/jmx/src/main/java/org/jboss/demos/bootstrap/jmx/JMXMain.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -21,7 +21,7 @@
*/
package org.jboss.demos.bootstrap.jmx;
-import org.jboss.demos.boostrap.Main;
+import org.jboss.demos.bootstrap.Main;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
Copied: projects/demos/microcontainer/branches/DZone_1_0/models/src/main/java/org/jboss/demos/models/jmx/MBeanServerQuery.java (from rev 82280, projects/demos/microcontainer/trunk/models/src/main/java/org/jboss/demos/models/jmx/MBeanServerQuery.java)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/models/src/main/java/org/jboss/demos/models/jmx/MBeanServerQuery.java (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/models/src/main/java/org/jboss/demos/models/jmx/MBeanServerQuery.java 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.demos.models.jmx;
+
+import java.util.Set;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import javax.management.QueryExp;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MBeanServerQuery
+{
+ private Logger log = Logger.getLogger(getClass());
+ private MBeanServer server;
+
+ public MBeanServerQuery(MBeanServer server)
+ {
+ if (server == null)
+ throw new IllegalArgumentException("Null server");
+
+ this.server = server;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Set<ObjectName> executeQuery(ObjectName name, QueryExp exp)
+ {
+ return server.queryNames(name, exp);
+ }
+
+ public void start()
+ {
+ Set<ObjectName> currentMBeans = executeQuery(null, null);
+ log.info("Listing all mbeans:");
+ int count = 0;
+ for (ObjectName on : currentMBeans)
+ {
+ log.info((++count) + ". " + on);
+ }
+ }
+}
Copied: projects/demos/microcontainer/branches/DZone_1_0/models/src/main/resources/META-INF/z-mbeanquery-beans.xml (from rev 82280, projects/demos/microcontainer/trunk/models/src/main/resources/META-INF/z-mbeanquery-beans.xml)
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/models/src/main/resources/META-INF/z-mbeanquery-beans.xml (rev 0)
+++ projects/demos/microcontainer/branches/DZone_1_0/models/src/main/resources/META-INF/z-mbeanquery-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -0,0 +1,9 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="MBeanServerQuery" class="org.jboss.demos.models.jmx.MBeanServerQuery">
+ <constructor>
+ <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
+ </constructor>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: projects/demos/microcontainer/branches/DZone_1_0/osgi/boot/bootstrap-beans.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/osgi/boot/bootstrap-beans.xml 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/osgi/boot/bootstrap-beans.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -176,13 +176,13 @@
</bean>
<!-- Hotdeployment of applications -->
- <bean name="MainDeployerHelper" class="org.jboss.demos.boostrap.MainDeployerHelper">
+ <bean name="MainDeployerHelper" class="org.jboss.demos.bootstrap.MainDeployerHelper">
<constructor>
<parameter><inject bean="MainDeployer"/></parameter>
</constructor>
</bean>
- <bean name="HDScanner" class="org.jboss.demos.boostrap.HDScanner">
+ <bean name="HDScanner" class="org.jboss.demos.bootstrap.HDScanner">
<constructor>
<parameter><inject bean="MainDeployerHelper"/></parameter>
<parameter>C:\\projects\\demos\\osgi\\boot\\work</parameter>
Modified: projects/demos/microcontainer/branches/DZone_1_0/pom.xml
===================================================================
--- projects/demos/microcontainer/branches/DZone_1_0/pom.xml 2008-12-15 14:53:04 UTC (rev 82280)
+++ projects/demos/microcontainer/branches/DZone_1_0/pom.xml 2008-12-15 15:36:49 UTC (rev 82281)
@@ -307,16 +307,70 @@
<version>${version.jboss.aop}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ <version>${version.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-jmx</artifactId>
+ <version>${version.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-j2se</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
+ <version>${version.jboss.aop}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
<version>${version.jboss.jbossas}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-jdk50</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <version>${version.jboss.jbossas}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>javassist</artifactId>
<version>${version.javassist}</version>
More information about the jboss-cvs-commits
mailing list