[jboss-svn-commits] JBL Code SVN: r30920 - in labs/jbossesb/branches/JBESB_4_7_CP/product: rosetta/src/org/jboss/soa/esb/listeners/config and 8 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Jan 5 05:20:36 EST 2010


Author: tfennelly
Date: 2010-01-05 05:20:35 -0500 (Tue, 05 Jan 2010)
New Revision: 30920

Added:
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF/jboss-esb.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd
Removed:
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF/jboss-esb.xml
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd
Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/.classpath
   labs/jbossesb/branches/JBESB_4_7_CP/product/product.properties
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
   labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java
Log:
https://jira.jboss.org/jira/browse/JBESB-3029
JBoss4ESBDeployer: does not support schema imports/includes for exploded archives.

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/.classpath
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/.classpath	2010-01-05 03:52:20 UTC (rev 30919)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/.classpath	2010-01-05 10:20:35 UTC (rev 30920)
@@ -88,29 +88,6 @@
 	<classpathentry kind="lib" path="build/lib/jsch-0.1.38.jar"/>
 	<classpathentry kind="lib" path="build/lib/log4j-1.2.14.jar"/>
 	<classpathentry kind="lib" path="build/lib/mail-1.4.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-commons-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-edisax-parser-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-magger-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-scribe-hibernate-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-scribe-ibatis-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-scribe-jpa-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-calc-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-core-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-css-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-csv-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-edi-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-ejc-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-javabean-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-json-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-misc-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-persistence-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-routing-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-rules-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-scripting-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-servlet-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-templating-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-smooks-validation-1.2.3.jar"/>
-	<classpathentry kind="lib" path="build/lib/milyn-tinak-1.2.3.jar"/>
 	<classpathentry kind="lib" path="build/lib/mina-core-1.1.7.jar"/>
 	<classpathentry kind="lib" path="build/lib/mvel2-2.0.12.jar"/>
 	<classpathentry kind="lib" path="build/lib/ognl-2.6.9.jar"/>
@@ -169,5 +146,29 @@
 	<classpathentry kind="lib" path="build/lib/juddi-core-3.0.0.jar"/>
 	<classpathentry kind="lib" path="build/lib/juddi-client-3.0.0.jar"/>
 	<classpathentry kind="lib" path="build/lib/jaxb-xjc-2.1.4.jar"/>
+	<classpathentry kind="var" path="ESB_ROOT"/>
+	<classpathentry kind="lib" path="build/lib/milyn-commons-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-edisax-parser-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-magger-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-scribe-hibernate-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-scribe-ibatis-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-scribe-jpa-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-calc-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-core-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-css-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-csv-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-edi-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-ejc-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-javabean-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-json-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-misc-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-persistence-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-routing-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-rules-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-scripting-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-servlet-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-templating-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-smooks-validation-1.2.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/milyn-tinak-1.2.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/product.properties
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/product.properties	2010-01-05 03:52:20 UTC (rev 30919)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/product.properties	2010-01-05 10:20:35 UTC (rev 30920)
@@ -7,7 +7,7 @@
 
 # uncomment the following if you wish to use an app server installation
 # for tests instead of the included jbossesb-server
-#org.jboss.esb.server.home=<app server home>
+#org.jboss.esb.server.home=/Users/tfennelly/packs/jboss_home
 
 # Uncomment all the ftp properties if you wish to override the ftp server
 #org.jboss.esb.test.ftp.hostname=<hostname:port>

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2010-01-05 03:52:20 UTC (rev 30919)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2010-01-05 10:20:35 UTC (rev 30920)
@@ -727,50 +727,78 @@
             return Collections.emptyMap();
         }
         
-        if (file.isDirectory())
+        if (file.isDirectory()) 
         {
             return getSchemasFromDirectory(file);
         }
-        else
+        
+        final String fileName = file.getName();
+        if (fileName.endsWith(".esb"))
+            return getSchemasFromArchive(file);
+	        
+        if (fileName.endsWith("-esb.xml"))
         {
-            return getSchemasFromArchive(file);
+            final File metaInf = file.getParentFile();
+            final File deploymentRoot = metaInf.getParentFile();
+            return getSchemasFromDirectory(deploymentRoot);
         }
+        
+        throw new DeploymentException("Unrecognized deployment : " + file + ".");
     }
-
+    
     static Map<String, String> getSchemasFromDirectory(final File directory) throws DeploymentException
     {
+        return getSchemasFromDir(directory, directory);
+    }
+
+    private static Map<String, String> getSchemasFromDir(final File root, final File directory) throws DeploymentException
+    {
         if (directory != null)
         {
+	        final Map<String, String> schemasMap = new HashMap<String, String>();
+            
             if (directory.isDirectory())
             {
-                final File[] schemas = directory.listFiles(new FilenameFilter() {
-                    public boolean accept(File dir, String name)
+                final File[] files = directory.listFiles();
+                for (File file : files)
+                {
+                    if (file.isDirectory())
                     {
-                        return isXsd(name);
+                        schemasMap.putAll(getSchemasFromDir(root, file));
                     }
-                });
-                if (schemas.length > 0)
-                {
-                    final Map<String, String> schemasMap = new HashMap<String, String>();
-                    for (File file : schemas)
+                    else if (isXsd(file.getName()))
                     {
                         try
                         {
-                            schemasMap.put(file.getName(), FileUtil.readTextFile(file));
+                            final String filename = determineSchemaFilename(root, file);
+                            schemasMap.put(filename, FileUtil.readTextFile(file));
                         } 
                         catch (final IOException e)
                         {
                             throw new DeploymentException("IOException while trying to read xsd '" + file.getName() + "'", e);
                         }
                     }
-                    return schemasMap;
                 }
             }
+            return schemasMap;
         }
         
         return Collections.emptyMap();
     }
-
+    
+    private static String determineSchemaFilename(final File rootDir, final File file)
+    {
+        final String rootName = rootDir.getName();
+        final String path = file.getPath();
+        int idx = path.indexOf(rootName);
+        if (idx != -1)
+        {
+            return path.substring(idx + rootName.length() + 1);
+        }
+        
+        return file.getName();
+    }
+    
     private static boolean isXsd(final String fileName)
     {
         return fileName.endsWith(".xsd");

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java	2010-01-05 03:52:20 UTC (rev 30919)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java	2010-01-05 10:20:35 UTC (rev 30920)
@@ -32,9 +32,9 @@
 import org.junit.Test;
 
 /**
+ * Unit test for JBoss4ESBDeployer. 
  * 
  * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>
- *
  */
 public class JBoss4ESBDeployerUnitTest
 {
@@ -47,11 +47,11 @@
     }
     
     @Test
-    public void getSchemas() throws DeploymentException
+    public void getSchemasFromDirectory() throws DeploymentException
     {
         File directory = new File(getClass().getResource("schemasDir").getFile());
         Map<String, String> schemas = JBoss4ESBDeployer.getSchemasFromDirectory(directory);
-        assertTrue(schemas.containsKey("mock.xsd"));
+        assertAddedSchemas(schemas);
     }
     
     @Test
@@ -64,12 +64,28 @@
     }
     
     @Test
+    public void getSchemasFromExplodedArchiveWithEsbFile() throws DeploymentException
+    {
+        final URL resource = getClass().getResource("schemasExploded.esb");
+        final File jbossEsbXml = new File(resource.getFile() + File.separator + "META-INF" + File.separator + "jboss-esb.xml" );
+        final Map<String, String> schemas = JBoss4ESBDeployer.getSchemas(jbossEsbXml);
+        assertAddedSchemas(schemas);
+    }
+    
+    @Test
     public void getSchemasFromArchiveNullArchive() throws DeploymentException
     {
         Map<String, String> schemas = JBoss4ESBDeployer.getSchemasFromArchive(null);
         assertTrue(schemas.isEmpty());
     }
     
+    private void assertAddedSchemas(final Map<String, String> schemas)
+    {
+        assertTrue(schemas.containsKey("mock.xsd"));
+        assertTrue(schemas.containsKey("subdir" + File.separator + "type.xsd"));
+        assertTrue(schemas.containsKey("subdir" + File.separator + "subdir2" + File.separator + "type.xsd"));
+    }
+
     public static junit.framework.Test suite()
     {
         return new JUnit4TestAdapter(JBoss4ESBDeployerUnitTest.class);

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir)

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2 (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2)

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd	2009-12-07 04:56:36 UTC (rev 30498)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -1,9 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="customType" type="x1:type"/>
-  <xs:complexType name="type">
-    <xs:sequence>
-      <xs:element name="customType" type="xs:string" minOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
-

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd)
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/subdir2/type.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -0,0 +1,9 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="customType" type="x1:type"/>
+  <xs:complexType name="type">
+    <xs:sequence>
+      <xs:element name="customType" type="xs:string" minOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd	2009-12-07 04:56:36 UTC (rev 30498)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -1,9 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="customType" type="x1:type"/>
-  <xs:complexType name="type">
-    <xs:sequence>
-      <xs:element name="customType" type="xs:string" minOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
-

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd)
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasDir/subdir/type.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -0,0 +1,9 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="customType" type="x1:type"/>
+  <xs:complexType name="type">
+    <xs:sequence>
+      <xs:element name="customType" type="xs:string" minOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb)

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF)

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF/jboss-esb.xml
===================================================================

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF/jboss-esb.xml (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/META-INF/jboss-esb.xml)
===================================================================

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd	2009-12-07 04:56:36 UTC (rev 30498)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -1,9 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="customType" type="x1:type"/>
-  <xs:complexType name="type">
-    <xs:sequence>
-      <xs:element name="customType" type="xs:string" minOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
-

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd)
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/mock.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -0,0 +1,9 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="customType" type="x1:type"/>
+  <xs:complexType name="type">
+    <xs:sequence>
+      <xs:element name="customType" type="xs:string" minOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir)

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2 (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2)

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd	2009-12-07 04:56:36 UTC (rev 30498)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -1,9 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="customType" type="x1:type"/>
-  <xs:complexType name="type">
-    <xs:sequence>
-      <xs:element name="customType" type="xs:string" minOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
-

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd)
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/subdir2/type.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -0,0 +1,9 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="customType" type="x1:type"/>
+  <xs:complexType name="type">
+    <xs:sequence>
+      <xs:element name="customType" type="xs:string" minOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+

Deleted: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd	2009-12-07 04:56:36 UTC (rev 30498)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -1,9 +0,0 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-  <xs:element name="customType" type="x1:type"/>
-  <xs:complexType name="type">
-    <xs:sequence>
-      <xs:element name="customType" type="xs:string" minOccurs="1"/>
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
-

Copied: labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd (from rev 30498, labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd)
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd	                        (rev 0)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/schemasExploded.esb/subdir/type.xsd	2010-01-05 10:20:35 UTC (rev 30920)
@@ -0,0 +1,9 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/custom" xmlns:x1="http://www.jboss.org/custome"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="customType" type="x1:type"/>
+  <xs:complexType name="type">
+    <xs:sequence>
+      <xs:element name="customType" type="xs:string" minOccurs="1"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
+



More information about the jboss-svn-commits mailing list