[jbosstools-commits] JBoss Tools SVN: r22580 - in workspace/smooks-dmb/smooks: plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model and 3 other directories.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Sat Jun 5 04:30:19 EDT 2010


Author: tfennelly
Date: 2010-06-05 04:30:18 -0400 (Sat, 05 Jun 2010)
New Revision: 22580

Added:
   workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
Removed:
   workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java
Modified:
   workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
   workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java
   workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java
   workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java
Log:
Moved SmooksModel class to org.jboss.tools.smooks.model

Modified: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF	2010-06-05 08:24:45 UTC (rev 22579)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/META-INF/MANIFEST.MF	2010-06-05 08:30:18 UTC (rev 22580)
@@ -10,7 +10,8 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.jboss.tools.smooks.runtime
 Bundle-Activator: org.jboss.tools.smooks.model.plugin.SmooksModelActivator
-Export-Package: org.jboss.tools.smooks.model.core,
+Export-Package: org.jboss.tools.smooks.model,
+ org.jboss.tools.smooks.model.core,
  org.jboss.tools.smooks.model.csv,
  org.jboss.tools.smooks.model.javabean,
  org.jboss.tools.smooks.model.plugin

Copied: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java (from rev 22579, workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java)
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java	                        (rev 0)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java	2010-06-05 08:30:18 UTC (rev 22580)
@@ -0,0 +1,57 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ *
+ * (C) 2009, JBoss Inc.
+ */
+package org.jboss.tools.smooks.model;
+
+import org.jboss.tools.smooks.model.core.Reader;
+import org.jboss.tools.smooks.model.javabean.Bean;
+import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Smooks Model Root.
+ *
+ * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
+ */
+ at DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks-1.1.xsd")
+public class SmooksModel {
+
+    public static final String MODEL_DESCRIPTOR = "org/jboss/tools/smooks/model/descriptor.properties";
+
+    private List<Reader> readers = new ArrayList<Reader>();
+    private List<Bean> beans = new ArrayList<Bean>();
+
+    public List<Reader> getReaders() {
+        return readers;
+    }
+
+    public void setReaders(List<Reader> readers) {
+        this.readers = readers;
+    }
+
+    public List<Bean> getBeans() {
+        return beans;
+    }
+
+    public void setBeans(List<Bean> beans) {
+        this.beans = beans;
+    }
+}


Property changes on: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/SmooksModel.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java
===================================================================
--- workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java	2010-06-05 08:24:45 UTC (rev 22579)
+++ workspace/smooks-dmb/smooks/plugins/org.jboss.tools.smooks.model/src/org/jboss/tools/smooks/model/core/SmooksModel.java	2010-06-05 08:30:18 UTC (rev 22580)
@@ -1,56 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- * Copyright 2009, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- *
- * (C) 2009, JBoss Inc.
- */
-package org.jboss.tools.smooks.model.core;
-
-import org.jboss.tools.smooks.model.javabean.Bean;
-import org.milyn.javabean.dynamic.serialize.DefaultNamespace;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Smooks Model Root.
- *
- * @author <a href="mailto:tom.fennelly at gmail.com">tom.fennelly at gmail.com</a>
- */
- at DefaultNamespace(uri = "http://www.milyn.org/xsd/smooks-1.1.xsd")
-public class SmooksModel {
-
-    public static final String MODEL_DESCRIPTOR = "org/jboss/tools/smooks/model/descriptor.properties";
-
-    private List<Reader> readers = new ArrayList<Reader>();
-    private List<Bean> beans = new ArrayList<Bean>();
-
-    public List<Reader> getReaders() {
-        return readers;
-    }
-
-    public void setReaders(List<Reader> readers) {
-        this.readers = readers;
-    }
-
-    public List<Bean> getBeans() {
-        return beans;
-    }
-
-    public void setBeans(List<Bean> beans) {
-        this.beans = beans;
-    }
-}

Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java	2010-06-05 08:24:45 UTC (rev 22579)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_2_Test.java	2010-06-05 08:30:18 UTC (rev 22580)
@@ -19,7 +19,7 @@
 import junit.framework.TestCase;
 import org.custommonkey.xmlunit.XMLAssert;
 import org.custommonkey.xmlunit.XMLUnit;
-import org.jboss.tools.smooks.model.core.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModel;
 import org.milyn.javabean.dynamic.Model;
 import org.milyn.javabean.dynamic.ModelBuilder;
 import org.xml.sax.SAXException;

Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java	2010-06-05 08:24:45 UTC (rev 22579)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/csv/CSVReader_1_3_Test.java	2010-06-05 08:30:18 UTC (rev 22580)
@@ -19,7 +19,7 @@
 import junit.framework.TestCase;
 import org.custommonkey.xmlunit.XMLAssert;
 import org.custommonkey.xmlunit.XMLUnit;
-import org.jboss.tools.smooks.model.core.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModel;
 import org.milyn.javabean.dynamic.Model;
 import org.milyn.javabean.dynamic.ModelBuilder;
 import org.xml.sax.SAXException;

Modified: workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java
===================================================================
--- workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java	2010-06-05 08:24:45 UTC (rev 22579)
+++ workspace/smooks-dmb/smooks/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/javabean/BeanTest.java	2010-06-05 08:30:18 UTC (rev 22580)
@@ -19,7 +19,7 @@
 import junit.framework.TestCase;
 import org.custommonkey.xmlunit.XMLAssert;
 import org.custommonkey.xmlunit.XMLUnit;
-import org.jboss.tools.smooks.model.core.SmooksModel;
+import org.jboss.tools.smooks.model.SmooksModel;
 import org.milyn.javabean.dynamic.Model;
 import org.milyn.javabean.dynamic.ModelBuilder;
 import org.xml.sax.SAXException;



More information about the jbosstools-commits mailing list