Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ExtenExecContentTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ExtenExecContentTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ExtenExecContentTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ExtenExecContentTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -22,7 +9,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; import org.apache.commons.scxml.modeling.ExtenExecContent; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class ExtenExecContentTest extend * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createExtenExecContent()); + setFixture(ModelingFactory.eINSTANCE.createExtenExecContent()); } /**
Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/FinalStateTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/FinalStateTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/FinalStateTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/FinalStateTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -22,7 +9,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; import org.apache.commons.scxml.modeling.FinalState; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class FinalStateTest extends Name * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createFinalState()); + setFixture(ModelingFactory.eINSTANCE.createFinalState()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/FinalizeTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/FinalizeTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/FinalizeTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/FinalizeTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -24,7 +11,7 @@ import junit.framework.TestCase; import junit.textui.TestRunner; import org.apache.commons.scxml.modeling.Finalize; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; /** * <!-- begin-user-doc --> @@ -88,7 +75,7 @@ public class FinalizeTest extends TestCa * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createFinalize()); + setFixture(ModelingFactory.eINSTANCE.createFinalize()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/HistoryStateTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/HistoryStateTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/HistoryStateTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/HistoryStateTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -22,7 +9,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; import org.apache.commons.scxml.modeling.HistoryState; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class HistoryStateTest extends Na * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createHistoryState()); + setFixture(ModelingFactory.eINSTANCE.createHistoryState()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/IfTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/IfTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/IfTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/IfTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -22,7 +9,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; import org.apache.commons.scxml.modeling.If; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class IfTest extends ExecutableCo * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createIf()); + setFixture(ModelingFactory.eINSTANCE.createIf()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/InitialStateTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/InitialStateTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/InitialStateTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/InitialStateTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -22,7 +9,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; import org.apache.commons.scxml.modeling.InitialState; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class InitialStateTest extends Na * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createInitialState()); + setFixture(ModelingFactory.eINSTANCE.createInitialState()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/InvokeTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/InvokeTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/InvokeTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/InvokeTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -24,7 +11,7 @@ import junit.framework.TestCase; import junit.textui.TestRunner; import org.apache.commons.scxml.modeling.Invoke; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; /** * <!-- begin-user-doc --> @@ -88,7 +75,7 @@ public class InvokeTest extends TestCase * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createInvoke()); + setFixture(ModelingFactory.eINSTANCE.createInvoke()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/LogTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/LogTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/LogTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/LogTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -22,7 +9,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; import org.apache.commons.scxml.modeling.Log; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class LogTest extends ExecutableC * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createLog()); + setFixture(ModelingFactory.eINSTANCE.createLog()); } /** Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingAllTests.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingAllTests.java?rev=945691&view=auto ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingAllTests.java (added) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingAllTests.java Tue May 18 15:13:13 2010 @@ -0,0 +1,50 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.apache.commons.scxml.modeling.tests; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import junit.textui.TestRunner; + +/** + * <!-- begin-user-doc --> + * A test suite for the '<em><b>Modeling</b></em>' model. + * <!-- end-user-doc --> + * @generated + */ +public class ModelingAllTests extends TestSuite { + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static void main(String[] args) { + TestRunner.run(suite()); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static Test suite() { + TestSuite suite = new ModelingAllTests("Modeling Tests"); + return suite; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ModelingAllTests(String name) { + super(name); + } + +} //ModelingAllTests Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingAllTests.java ------------------------------------------------------------------------------ svn:eol-style = native Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingExample.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingExample.java?rev=945691&view=auto ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingExample.java (added) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingExample.java Tue May 18 15:13:13 2010 @@ -0,0 +1,128 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.apache.commons.scxml.modeling.tests; + +import java.io.File; +import java.io.IOException; + +import java.util.Iterator; + +import org.apache.commons.scxml.modeling.ModelingFactory; +import org.apache.commons.scxml.modeling.ModelingPackage; +import org.apache.commons.scxml.modeling.NamedElement; + +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.URI; + +import org.eclipse.emf.ecore.EObject; + +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; + +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; + +import org.eclipse.emf.ecore.util.Diagnostician; + +import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; + +/** + * <!-- begin-user-doc --> + * A sample utility for the '<em><b>modeling</b></em>' package. + * <!-- end-user-doc --> + * @generated + */ +public class ModelingExample { + /** + * <!-- begin-user-doc --> + * Load all the argument file paths or URIs as instances of the model. + * <!-- end-user-doc --> + * @param args the file paths or URIs. + * @generated + */ + public static void main(String[] args) { + // Create a resource set to hold the resources. + // + ResourceSet resourceSet = new ResourceSetImpl(); + + // Register the appropriate resource factory to handle all file extensions. + // + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put + (Resource.Factory.Registry.DEFAULT_EXTENSION, + new XMIResourceFactoryImpl()); + + // Register the package to ensure it is available during loading. + // + resourceSet.getPackageRegistry().put + (ModelingPackage.eNS_URI, + ModelingPackage.eINSTANCE); + + // If there are no arguments, emit an appropriate usage message. + // + if (args.length == 0) { + System.out.println("Enter a list of file paths or URIs that have content like this:"); + try { + Resource resource = resourceSet.createResource(URI.createURI("http:///My.modeling";)); + NamedElement root = ModelingFactory.eINSTANCE.createNamedElement(); + resource.getContents().add(root); + resource.save(System.out, null); + } + catch (IOException exception) { + exception.printStackTrace(); + } + } + else { + // Iterate over all the arguments. + // + for (int i = 0; i < args.length; ++i) { + // Construct the URI for the instance file. + // The argument is treated as a file path only if it denotes an existing file. + // Otherwise, it's directly treated as a URL. + // + File file = new File(args[i]); + URI uri = file.isFile() ? URI.createFileURI(file.getAbsolutePath()): URI.createURI(args[0]); + + try { + // Demand load resource for this file. + // + Resource resource = resourceSet.getResource(uri, true); + System.out.println("Loaded " + uri); + + // Validate the contents of the loaded resource. + // + for (Iterator j = resource.getContents().iterator(); j.hasNext(); ) { + EObject eObject = (EObject)j.next(); + Diagnostic diagnostic = Diagnostician.INSTANCE.validate(eObject); + if (diagnostic.getSeverity() != Diagnostic.OK) { + printDiagnostic(diagnostic, ""); + } + } + } + catch (RuntimeException exception) { + System.out.println("Problem loading " + uri); + exception.printStackTrace(); + } + } + } + } + + /** + * <!-- begin-user-doc --> + * Prints diagnostics with indentation. + * <!-- end-user-doc --> + * @param diagnostic the diagnostic to print. + * @param indent the indentation for printing. + * @generated + */ + protected static void printDiagnostic(Diagnostic diagnostic, String indent) { + System.out.print(indent); + System.out.println(diagnostic.getMessage()); + for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext(); ) { + printDiagnostic((Diagnostic)i.next(), indent + " "); + } + } + +} //ModelingExample Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingExample.java ------------------------------------------------------------------------------ svn:eol-style = native Added: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingTests.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingTests.java?rev=945691&view=auto ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingTests.java (added) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingTests.java Tue May 18 15:13:13 2010 @@ -0,0 +1,50 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.apache.commons.scxml.modeling.tests; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import junit.textui.TestRunner; + +/** + * <!-- begin-user-doc --> + * A test suite for the '<em><b>modeling</b></em>' package. + * <!-- end-user-doc --> + * @generated + */ +public class ModelingTests extends TestSuite { + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static void main(String[] args) { + TestRunner.run(suite()); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static Test suite() { + TestSuite suite = new ModelingTests("modeling Tests"); + return suite; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public ModelingTests(String name) { + super(name); + } + +} //ModelingTests Propchange: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ModelingTests.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/NamedElementTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/NamedElementTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/NamedElementTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/NamedElementTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -23,8 +10,8 @@ import junit.framework.TestCase; import junit.textui.TestRunner; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.NamedElement; -import org.apache.commons.scxml.modeling.ScxmlFactory; /** * <!-- begin-user-doc --> @@ -88,7 +75,7 @@ public class NamedElementTest extends Te * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createNamedElement()); + setFixture(ModelingFactory.eINSTANCE.createNamedElement()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/OnEntryTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/OnEntryTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/OnEntryTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/OnEntryTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -23,8 +10,8 @@ import junit.framework.TestCase; import junit.textui.TestRunner; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.OnEntry; -import org.apache.commons.scxml.modeling.ScxmlFactory; /** * <!-- begin-user-doc --> @@ -88,7 +75,7 @@ public class OnEntryTest extends TestCas * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createOnEntry()); + setFixture(ModelingFactory.eINSTANCE.createOnEntry()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/OnExitTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/OnExitTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/OnExitTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/OnExitTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -23,8 +10,8 @@ import junit.framework.TestCase; import junit.textui.TestRunner; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.OnExit; -import org.apache.commons.scxml.modeling.ScxmlFactory; /** * <!-- begin-user-doc --> @@ -88,7 +75,7 @@ public class OnExitTest extends TestCase * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createOnExit()); + setFixture(ModelingFactory.eINSTANCE.createOnExit()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ParallelTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ParallelTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ParallelTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ParallelTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -21,8 +8,8 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.Parallel; -import org.apache.commons.scxml.modeling.ScxmlFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class ParallelTest extends NamedE * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createParallel()); + setFixture(ModelingFactory.eINSTANCE.createParallel()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ParamTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ParamTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ParamTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ParamTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -21,8 +8,8 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.Param; -import org.apache.commons.scxml.modeling.ScxmlFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class ParamTest extends Executabl * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createParam()); + setFixture(ModelingFactory.eINSTANCE.createParam()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/RaiseTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/RaiseTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/RaiseTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/RaiseTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -21,8 +8,8 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.Raise; -import org.apache.commons.scxml.modeling.ScxmlFactory; /** * <!-- begin-user-doc --> @@ -68,7 +55,7 @@ public class RaiseTest extends Executabl * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createRaise()); + setFixture(ModelingFactory.eINSTANCE.createRaise()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ScriptTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ScriptTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ScriptTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ScriptTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -23,8 +10,8 @@ import junit.framework.TestCase; import junit.textui.TestRunner; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.Script; -import org.apache.commons.scxml.modeling.ScxmlFactory; /** * <!-- begin-user-doc --> @@ -88,7 +75,7 @@ public class ScriptTest extends TestCase * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createScript()); + setFixture(ModelingFactory.eINSTANCE.createScript()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/SendTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/SendTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/SendTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/SendTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -21,7 +8,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.Send; /** @@ -68,7 +55,7 @@ public class SendTest extends Executable * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createSend()); + setFixture(ModelingFactory.eINSTANCE.createSend()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ServiceTemplateTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ServiceTemplateTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ServiceTemplateTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ServiceTemplateTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -23,7 +10,7 @@ import junit.framework.TestCase; import junit.textui.TestRunner; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.ServiceTemplate; /** @@ -88,7 +75,7 @@ public class ServiceTemplateTest extends * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createServiceTemplate()); + setFixture(ModelingFactory.eINSTANCE.createServiceTemplate()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/StateTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/StateTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/StateTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/StateTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -21,7 +8,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.State; /** @@ -68,7 +55,7 @@ public class StateTest extends NamedElem * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createState()); + setFixture(ModelingFactory.eINSTANCE.createState()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/TranslationTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/TranslationTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/TranslationTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/TranslationTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -23,7 +10,7 @@ import junit.framework.TestCase; import junit.textui.TestRunner; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.Translation; /** @@ -88,7 +75,7 @@ public class TranslationTest extends Tes * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createTranslation()); + setFixture(ModelingFactory.eINSTANCE.createTranslation()); } /** Modified: commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ValidateTest.java URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ValidateTest.java?rev=945691&r1=945690&r2=945691&view=diff ============================================================================== --- commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ValidateTest.java (original) +++ commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/test/java/org.apache.commons.scxml.tests/src/org/apache/commons/scxml/modeling/tests/ValidateTest.java Tue May 18 15:13:13 2010 @@ -1,19 +1,6 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * + * <copyright> + * </copyright> * * $Id$ */ @@ -21,7 +8,7 @@ package org.apache.commons.scxml.modelin import junit.textui.TestRunner; -import org.apache.commons.scxml.modeling.ScxmlFactory; +import org.apache.commons.scxml.modeling.ModelingFactory; import org.apache.commons.scxml.modeling.Validate; /** @@ -68,7 +55,7 @@ public class ValidateTest extends Execut * @generated */ protected void setUp() throws Exception { - setFixture(ScxmlFactory.eINSTANCE.createValidate()); + setFixture(ModelingFactory.eINSTANCE.createValidate()); } /**
