Commit 7b2dff95 authored by Philippe Merle's avatar Philippe Merle

Moved package org.ow2.frascati.factory to org.ow2.frascati.assembly.factory

Warning this impacts your development:
* update the package of classes Factory, CompositeManager, etc. that you use.
* update the composite where your Assembly Factory plugins are declared
  from resources/org/ow2/frascati/factory/AssemblyFactory.composite
  to   resources/org/ow2/frascati/assembly/factory/AssemblyFactory.composite
parent bcae179c
......@@ -42,6 +42,8 @@ import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.ow2.frascati.assembly.factory.Factory;
import org.ow2.frascati.assembly.factory.Launcher;
import org.ow2.frascati.fscript.FrascatiScriptFactory;
import org.ow2.frascati.util.FrascatiException;
......
......@@ -37,6 +37,8 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.ow2.frascati.assembly.factory.Factory;
import org.ow2.frascati.assembly.factory.Launcher;
import org.ow2.frascati.util.FrascatiException;
/**
......
......@@ -30,7 +30,7 @@ import org.junit.Before;
import org.junit.Test;
import org.objectweb.fractal.api.Component;
import org.osoa.sca.ServiceUnavailableException;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.assembly.factory.Factory;
import org.ow2.frascati.tinfi.TinfiDomain;
public class AvailabilityTestCase {
......
......@@ -36,7 +36,7 @@ import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.assembly.factory.Factory;
import org.ow2.frascati.tinfi.TinfiDomain;
import org.ow2.frascati.util.FrascatiException;
......
......@@ -32,7 +32,7 @@ import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.control.IllegalLifeCycleException;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.assembly.factory.Factory;
import org.ow2.frascati.tinfi.TinfiDomain;
import org.ow2.frascati.util.FrascatiException;
......
......@@ -51,8 +51,8 @@ import org.objectweb.util.explorer.swing.api.Explorer;
import org.objectweb.util.explorer.swing.api.StatusBar;
import org.objectweb.util.explorer.swing.api.ViewPanel;
import org.objectweb.util.explorer.swing.lib.DefaultTreePanel;
import org.ow2.frascati.factory.api.ClassLoaderManager;
import org.ow2.frascati.factory.api.CompositeManager;
import org.ow2.frascati.assembly.factory.api.ClassLoaderManager;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
/**
* The main FraSCAti Framework Explorer GUI.
......
......@@ -32,10 +32,11 @@ import org.objectweb.fractal.adl.FactoryFactory;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.util.Fractal;
import org.ow2.frascati.factory.api.CompositeManager;
import org.ow2.frascati.factory.api.ManagerException;
import org.ow2.frascati.factory.core.domain.DomainException;
import org.ow2.frascati.factory.runtime.domain.api.Domain;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
import org.ow2.frascati.assembly.factory.api.ManagerException;
import org.ow2.frascati.assembly.factory.core.domain.DomainException;
// TO REMOVE
// import org.ow2.frascati.assembly.factory.runtime.domain.api.Domain;
/**
* FraSCAti Explorer launcher.
......
......@@ -33,9 +33,10 @@ import java.util.logging.Logger;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import org.ow2.frascati.explorer.ExplorerGUI;
import org.ow2.frascati.factory.api.CompositeManager;
import org.ow2.frascati.factory.api.ManagerException;
import org.ow2.frascati.factory.runtime.domain.api.Domain;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
import org.ow2.frascati.assembly.factory.api.ManagerException;
// TO REMOVE
// import org.ow2.frascati.factory.runtime.domain.api.Domain;
/**
* Artifact used to manage the "Add to classpath" action.
......
......@@ -34,10 +34,11 @@ import javax.swing.filechooser.FileFilter;
import org.mortbay.log.Log;
import org.objectweb.fractal.api.Component;
import org.ow2.frascati.explorer.ExplorerGUI;
import org.ow2.frascati.factory.api.CompositeManager;
import org.ow2.frascati.factory.api.ManagerException;
import org.ow2.frascati.factory.core.domain.DomainException;
import org.ow2.frascati.factory.runtime.domain.api.Domain;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
import org.ow2.frascati.assembly.factory.api.ManagerException;
// TO REMOVE
// import org.ow2.frascati.factory.core.domain.DomainException;
// import org.ow2.frascati.factory.runtime.domain.api.Domain;
import de.schlichtherle.io.swing.JFileChooser;
......
......@@ -32,8 +32,9 @@ import org.objectweb.fractal.explorer.FcExplorer;
import org.objectweb.util.explorer.api.Context;
import org.objectweb.util.explorer.api.Entry;
import org.objectweb.util.explorer.core.naming.lib.DefaultEntry;
import org.ow2.frascati.factory.api.CompositeManager;
import org.ow2.frascati.factory.runtime.domain.api.Domain;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
// TO REMOVE
// import org.ow2.frascati.factory.runtime.domain.api.Domain;
/**
* The FraSCAti Explorer Context for an SCA Domain.
......
......@@ -48,10 +48,10 @@
</node> -->
<!-- ================================================================= -->
<!-- For org.ow2.frascati.factory.runtime.domain.api.Domain -->
<!-- For org.ow2.frascati.assembly.factory.api.CompositeManager -->
<!-- ================================================================= -->
<node type-name="org.ow2.frascati.factory.api.CompositeManager">
<node type-name="org.ow2.frascati.assembly.factory.api.CompositeManager">
<icon><icon-file url="icons/domain.png"/></icon>
<menu>
<item label="Load">
......
......@@ -37,7 +37,7 @@
<interface name="r" contingency="mandatory" role="server" cardinality="singleton"
signature="java.lang.Runnable"/>
<interface name="domain-composite-manager" contingency="mandatory" role="server" cardinality="singleton"
signature="org.ow2.frascati.factory.api.CompositeManager"/>
signature="org.ow2.frascati.assembly.factory.api.CompositeManager"/>
<!-- The FraSCAti Explorer Core -->
<component name="frascati-explorer-core"
......
......@@ -39,10 +39,10 @@
signature="java.lang.Runnable"/>
<interface name="domain-composite-manager" role="client"
signature="org.ow2.frascati.factory.api.CompositeManager" />
signature="org.ow2.frascati.assembly.factory.api.CompositeManager" />
<interface name="domain-classloader-manager" role="client"
signature="org.ow2.frascati.factory.api.ClassLoaderManager" />
signature="org.ow2.frascati.assembly.factory.api.ClassLoaderManager" />
<interface name="binding-factory" role="client"
signature="org.objectweb.fractal.bf.BindingFactory" />
......
......@@ -55,7 +55,7 @@ import javax.swing.text.StyledDocument;
import org.objectweb.fractal.fscript.FScriptException;
import org.objectweb.fractal.fscript.InvalidScriptException;
import org.ow2.frascati.factory.api.ClassLoaderManager;
import org.ow2.frascati.assembly.factory.api.ClassLoaderManager;
import org.ow2.frascati.fscript.FraSCAtiScript;
import de.schlichtherle.io.FileInputStream;
......
......@@ -28,7 +28,7 @@ package org.ow2.frascati.test;
import org.junit.Test;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.assembly.factory.Factory;
/**
* JUnit test case for Factory class.
......
......@@ -28,7 +28,7 @@ package org.ow2.frascati.test;
import org.junit.Test;
import org.ow2.frascati.factory.Factory;
import org.ow2.frascati.assembly.factory.Factory;
/**
* JUnit test case for Factory class.
......
......@@ -91,8 +91,8 @@
<artifactId>maven-juliac-plugin</artifactId>
<configuration>
<adls>
<adl>org.ow2.frascati.factory.EmptyComposite</adl>
<adl>org.ow2.frascati.factory.AssemblyFactoryBootstrap</adl>
<adl>org.ow2.frascati.assembly.factory.EmptyComposite</adl>
<adl>org.ow2.frascati.assembly.factory.AssemblyFactoryBootstrap</adl>
</adls>
</configuration>
</plugin>
......
......@@ -26,7 +26,7 @@
*
*/
package org.ow2.frascati.factory;
package org.ow2.frascati.assembly.factory;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
......@@ -40,8 +40,8 @@ import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.factory.Factory;
import org.objectweb.fractal.util.Fractal;
import org.ow2.frascati.factory.api.ClassLoaderManager;
import org.ow2.frascati.factory.api.CompositeManager;
import org.ow2.frascati.assembly.factory.api.ClassLoaderManager;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
import org.ow2.frascati.tinfi.TinfiDomain;
import org.ow2.frascati.util.AbstractLoggeable;
import org.ow2.frascati.util.FrascatiException;
......@@ -241,7 +241,7 @@ public class AssemblyFactory
* Get the name of the ADL definition representing the bootstrap factory to use.
*/
protected String getBootstrapFactoryName() {
return "org.ow2.frascati.factory.AssemblyFactoryBootstrap";
return "org.ow2.frascati.assembly.factory.AssemblyFactoryBootstrap";
}
/**
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.api;
package org.ow2.frascati.assembly.factory.api;
import java.net.URL;
import java.net.URLClassLoader;
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.api;
package org.ow2.frascati.assembly.factory.api;
import java.net.URL;
import javax.xml.namespace.QName;
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.api;
package org.ow2.frascati.assembly.factory.api;
import org.ow2.frascati.util.FrascatiException;
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.api;
package org.ow2.frascati.assembly.factory.api;
import org.ow2.frascati.parser.api.ParsingContext;
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.api;
package org.ow2.frascati.assembly.factory.api;
import org.osoa.sca.annotations.Service;
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.manager;
package org.ow2.frascati.assembly.factory.manager;
import java.io.BufferedOutputStream;
import java.io.File;
......@@ -63,13 +63,13 @@ import org.objectweb.fractal.api.control.IllegalLifeCycleException;
import org.objectweb.fractal.api.control.LifeCycleController;
import org.objectweb.fractal.util.Fractal;
import org.ow2.frascati.factory.api.ClassLoaderManager;
import org.ow2.frascati.factory.api.CompositeManager;
import org.ow2.frascati.factory.api.ManagerException;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.Processor;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.factory.processor.ProcessingContextImpl;
import org.ow2.frascati.assembly.factory.api.ClassLoaderManager;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
import org.ow2.frascati.assembly.factory.api.ManagerException;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.processor.ProcessingContextImpl;
import org.ow2.frascati.tinfi.TinfiDomain;
import org.ow2.frascati.tinfi.api.TinfiComponentFactory;
import org.ow2.frascati.tinfi.api.TinfiException;
......
......@@ -23,7 +23,7 @@
* Contributor(s): Philippe Merle
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import java.util.HashMap;
import java.util.Map;
......@@ -36,8 +36,8 @@ import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.api.type.TypeFactory;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.tinfi.api.TinfiException;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
......
......@@ -23,7 +23,7 @@
* Contributor(s): Philippe Merle
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import org.eclipse.stp.sca.BaseService;
......@@ -32,8 +32,8 @@ import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.objectweb.fractal.api.type.InterfaceType;
import org.objectweb.fractal.api.type.TypeFactory;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.tinfi.api.TinfiException;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
......
......@@ -24,12 +24,12 @@
*
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import org.eclipse.stp.sca.Binding;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
/**
* OW2 FraSCAti SCA binding processor abstract class.
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import java.util.ArrayList;
import java.util.List;
......@@ -42,9 +42,9 @@ import org.objectweb.fractal.util.Fractal;
import org.osoa.sca.annotations.Reference;
import org.ow2.frascati.factory.api.Processor;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.tinfi.api.TinfiTypeFactory;
import org.ow2.frascati.tinfi.api.TinfiException;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
......
......@@ -24,12 +24,12 @@
*
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import org.eclipse.stp.sca.Implementation;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
/**
* OW2 FraSCAti Assembly Factory SCA implementation processor abstract class.
......
......@@ -23,7 +23,7 @@
* Contributor(s): Philippe Merle
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import java.util.List;
import javax.xml.namespace.QName;
......@@ -35,9 +35,9 @@ import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.osoa.sca.annotations.Reference;
import org.ow2.frascati.factory.api.CompositeManager;
import org.ow2.frascati.factory.api.ManagerException;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.CompositeManager;
import org.ow2.frascati.assembly.factory.api.ManagerException;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.tinfi.control.intent.IntentHandler;
import org.ow2.frascati.tinfi.control.intent.SCABasicIntentController;
......
......@@ -23,7 +23,7 @@
* Contributor(s):
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import org.eclipse.emf.ecore.EObject;
......@@ -32,7 +32,7 @@ import org.eclipse.stp.sca.Interface;
import org.osoa.sca.annotations.Reference;
import org.ow2.frascati.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.tinfi.api.TinfiTypeFactory;
/**
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import java.util.List;
......@@ -33,9 +33,9 @@ import org.eclipse.emf.ecore.EObject;
import org.osoa.sca.annotations.Scope;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.Processor;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.util.AbstractLoggeable;
/**
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import java.util.HashMap;
import java.util.List;
......@@ -34,9 +34,9 @@ import org.eclipse.emf.ecore.EObject;
import org.osoa.sca.annotations.Init;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.Processor;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
/**
* OW2 FraSCAti Assembly Factory abstract processor manager class.
......
......@@ -23,7 +23,7 @@
* Contributor(s): Nicolas Dolet, Philippe Merle
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import java.util.List;
......@@ -36,12 +36,11 @@ import org.osoa.sca.annotations.Reference;
import org.objectweb.fractal.api.Component;
import org.objectweb.fractal.api.NoSuchInterfaceException;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.factory.api.ProcessorException;
import org.ow2.frascati.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessorException;
import org.ow2.frascati.assembly.factory.api.Processor;
import org.ow2.frascati.tinfi.control.property.SCAPropertyController;
/**
* OW2 FraSCAti Assembly Factory abstract property processor class.
*
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import org.eclipse.stp.sca.SCAPropertyBase;
import org.eclipse.stp.sca.Property;
......
......@@ -24,9 +24,9 @@
*
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import org.ow2.frascati.factory.api.ProcessingContext;
import org.ow2.frascati.assembly.factory.api.ProcessingContext;
import org.ow2.frascati.parser.core.ParsingContextImpl;
/**
......
......@@ -24,7 +24,7 @@
*
*/
package org.ow2.frascati.factory.processor;
package org.ow2.frascati.assembly.factory.processor;
import java.util.List;
......@@ -33,7 +33,7 @@ import org.eclipse.stp.sca.ScaPackage;
import org.osoa.sca.annotations.Reference;
import org.ow2.frascati.factory.api.Processor;
import org.ow2.frascati.assembly.factory.api.Processor;
/**
* OW2 FraSCAti Asssembly Factory SCA binding processor class.
......