Author: objectiser
Date: 2008-10-21 17:58:16 -0400 (Tue, 21 Oct 2008)
New Revision: 410
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/CreateSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/IfAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/MessageRouterAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ParallelAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/PerformAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/RetrieveSessionAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ScheduleStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SendMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetMessageAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetStateAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SwitchAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/UnsupportedAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhenAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhileAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ClasspathUtil.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java
Log:
Refactored to move admin related classes out of the org.scribble.model package into a
subpackage.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/dialogs/GenerateDialog.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -29,6 +29,8 @@
import org.scribble.conversation.model.ConversationModel;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.*;
+import org.scribble.model.admin.DefaultModelListener;
+import org.scribble.model.admin.ModelRepository;
/**
* This class provides the dialog for generating JBossESB
@@ -60,7 +62,7 @@
*/
protected void initialize(IFile res) {
ModelReference ref=
- org.scribble.osgi.model.OSGIModelRepository.createReference(res);
+ org.scribble.osgi.model.admin.OSGIModelRepository.createReference(res);
if (ref != null) {
ModelRepository mrep=(ModelRepository)
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/editor/JBossESBConfigEditorManager.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -45,10 +45,10 @@
java.util.Map<String,Object> props) {
String uri=null;
org.eclipse.core.resources.IFile file=
- org.scribble.osgi.model.OSGIModelRepository.getFile(mref);
+ org.scribble.osgi.model.admin.OSGIModelRepository.getFile(mref);
if (file == null || file.exists() == false) {
- file = org.scribble.osgi.model.OSGIModelRepository.getGlobalFile(mref);
+ file = org.scribble.osgi.model.admin.OSGIModelRepository.getGlobalFile(mref);
}
if (file != null && file.exists()) {
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/generator/Generator.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -31,6 +31,8 @@
import org.scribble.conversation.model.ConversationModel;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.*;
+import org.scribble.model.admin.DefaultModelListener;
+import org.scribble.model.admin.ModelRepository;
import org.scribble.model.change.ModelGenerator;
import org.scribble.conversation.model.*;
import org.w3c.dom.Node;
@@ -75,7 +77,7 @@
// Initialize the model
ModelReference ref=
- org.scribble.osgi.model.OSGIModelRepository.createReference(res);
+ org.scribble.osgi.model.admin.OSGIModelRepository.createReference(res);
if (ref != null) {
ModelRepository mrep=(ModelRepository)
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBLanguageModel.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -22,6 +22,9 @@
import org.scribble.conversation.model.*;
import org.scribble.extensions.RegistryFactory;
import org.scribble.model.*;
+import org.scribble.model.admin.DependencyType;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.scribble.model.resolutions.*;
/**
@@ -130,10 +133,10 @@
org.w3c.dom.NodeList services=
m_esbConfig.getElementsByTagName(SERVICES_ELEMENT);
- org.scribble.model.DependencyManager dm=
- (org.scribble.model.DependencyManager)
+ org.scribble.model.admin.DependencyManager dm=
+ (org.scribble.model.admin.DependencyManager)
org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
- org.scribble.model.DependencyManager.class, null);
+ org.scribble.model.admin.DependencyManager.class, null);
ModelName mname=new ModelName();
mname.setName(m_source.getLocalpart());
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/DefaultESBService.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -21,6 +21,9 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ESBModelUtil;
import org.scribble.model.*;
+import org.scribble.model.admin.DependencyType;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.scribble.conversation.model.*;
/**
@@ -672,10 +675,10 @@
ret.getImplements().add(iref);
//ret.getConformsTo().add(iref);
- org.scribble.model.DependencyManager dm=
- (org.scribble.model.DependencyManager)
+ org.scribble.model.admin.DependencyManager dm=
+ (org.scribble.model.admin.DependencyManager)
org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
- org.scribble.model.DependencyManager.class, null);
+ org.scribble.model.admin.DependencyManager.class, null);
if (dm != null) {
dm.recordDependency(getModel().getModelReference(),
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -18,6 +18,7 @@
package org.jboss.tools.overlord.cdl.runtime.jbossesb.model;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
/**
* This interface represents the generic ESB action class.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBLanguageModel.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -18,6 +18,7 @@
package org.jboss.tools.overlord.cdl.runtime.jbossesb.model;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
/**
* This class represents an ESB model.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/ESBService.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,7 @@
import org.scribble.conversation.model.Conversation;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
/**
* This interface represents an ESB service.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/AbstractESBAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -20,6 +20,8 @@
import java.util.logging.Logger;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ESBModelUtil;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.ProblemDefinitions;
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/CreateSessionAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/CreateSessionAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/CreateSessionAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -22,6 +22,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBActionFactory;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
/**
* The model component for the 'CreateSessionAction'.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/IfAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/IfAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/IfAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.scribble.conversation.model.*;
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/MessageRouterAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/MessageRouterAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/MessageRouterAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -24,6 +24,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
/**
* The model component for the 'MessageRouterAction'. Although
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ParallelAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ParallelAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ParallelAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.scribble.conversation.model.*;
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/PerformAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/PerformAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/PerformAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -20,6 +20,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.PropertyUtil;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.scribble.conversation.model.*;
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/RetrieveSessionAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/RetrieveSessionAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/RetrieveSessionAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
/**
* The model component for the 'RetrieveSessionAction'.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ScheduleStateAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ScheduleStateAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/ScheduleStateAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
/**
* The model component for the 'ScheduleStateAction'.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SendMessageAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SendMessageAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SendMessageAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -20,6 +20,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
/**
* The model component for the 'SendMessageAction'.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetMessageAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetMessageAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetMessageAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,7 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
/**
* The model component for the 'SetMessageAction'.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetStateAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetStateAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SetStateAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -22,6 +22,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.PropertyUtil;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
/**
* The model component for the 'SetStateAction'.
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SwitchAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SwitchAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/SwitchAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -20,6 +20,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util.InteractionUtil;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.scribble.conversation.model.*;
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/UnsupportedAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/UnsupportedAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/UnsupportedAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,7 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
/**
* This class represents an unsupported (or custom) action within
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhenAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhenAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhenAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.scribble.conversation.model.*;
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhileAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhileAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/actions/WhileAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -19,6 +19,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelIssue;
+import org.scribble.model.admin.ModelListener;
import org.scribble.conversation.model.*;
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ClasspathUtil.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ClasspathUtil.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/util/ClasspathUtil.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -18,7 +18,7 @@
package org.jboss.tools.overlord.cdl.runtime.jbossesb.model.util;
import org.scribble.model.*;
-import org.scribble.osgi.model.OSGIModelRepository;
+import org.scribble.osgi.model.admin.OSGIModelRepository;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/parser/JBossESBParser.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -25,6 +25,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
import org.scribble.extensions.*;
import org.scribble.parser.Parser;
@@ -52,10 +53,10 @@
ModelListener l) {
DefaultESBLanguageModel ret=null;
- org.scribble.model.DependencyManager dm=
- (org.scribble.model.DependencyManager)
+ org.scribble.model.admin.DependencyManager dm=
+ (org.scribble.model.admin.DependencyManager)
org.scribble.extensions.RegistryFactory.getRegistry().getExtension(
- org.scribble.model.DependencyManager.class, null);
+ org.scribble.model.admin.DependencyManager.class, null);
try {
// Transform the text representation to DOM
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/java/org/jboss/tools/overlord/cdl/runtime/jbossesb/validation/ESBLanguageModelValidationRule.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -20,6 +20,7 @@
import org.scribble.validation.*;
import org.scribble.extensions.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.*;
/**
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBAction.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -22,7 +22,7 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ConversionContext;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBAction;
import org.scribble.model.Activity;
-import org.scribble.model.ModelListener;
+import org.scribble.model.admin.ModelListener;
import org.w3c.dom.Element;
public class TestESBAction implements ESBAction {
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBLanguageModel.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -22,8 +22,8 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBLanguageModel;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.DefaultESBService;
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBService;
-import org.scribble.model.ModelListener;
import org.scribble.model.ModelReference;
+import org.scribble.model.admin.ModelListener;
import org.w3c.dom.Element;
public class TestESBLanguageModel extends org.scribble.lang.model.LanguageModel
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestESBService.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -24,6 +24,7 @@
import org.jboss.tools.overlord.cdl.runtime.jbossesb.model.ESBLanguageModel;
import org.scribble.conversation.model.*;
import org.scribble.model.*;
+import org.scribble.model.admin.ModelListener;
import org.w3c.dom.Element;
public class TestESBService extends ModelObject
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java
===================================================================
---
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java 2008-10-21
14:30:49 UTC (rev 409)
+++
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.runtime.jbossesb/src/test/org/jboss/tools/overlord/cdl/runtime/jbossesb/model/TestModelListener.java 2008-10-21
21:58:16 UTC (rev 410)
@@ -17,10 +17,10 @@
*/
package org.jboss.tools.overlord.cdl.runtime.jbossesb.model;
-import org.scribble.model.ModelIssue;
import org.scribble.model.ModelObject;
+import org.scribble.model.admin.ModelIssue;
-public class TestModelListener implements org.scribble.model.ModelListener {
+public class TestModelListener implements org.scribble.model.admin.ModelListener {
public void error(ModelIssue issue) {
reported(issue.getMessage());