You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2005/06/16 19:55:05 UTC
svn commit: r190971 - in /xmlbeans/trunk: external/lib/
src/typeimpl/org/apache/xmlbeans/impl/schema/
test/src/compile/scomp/checkin/ test/src/compile/scomp/common/
test/src/compile/scomp/som/common/
Author: cezar
Date: Thu Jun 16 10:55:04 2005
New Revision: 190971
URL: http://svn.apache.org/viewcvs?rev=190971&view=rev
Log:
New location for schema metadata.
Modified:
xmlbeans/trunk/external/lib/oldxbean.jar
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java
xmlbeans/trunk/test/src/compile/scomp/checkin/XmlBeansCompCheckinTests.java
xmlbeans/trunk/test/src/compile/scomp/common/CompileCommon.java
xmlbeans/trunk/test/src/compile/scomp/som/common/SomTestBase.java
Modified: xmlbeans/trunk/external/lib/oldxbean.jar
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/external/lib/oldxbean.jar?rev=190971&r1=190970&r2=190971&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java?rev=190971&r1=190970&r2=190971&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java (original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java Thu Jun 16 10:55:04 2005
@@ -144,7 +144,7 @@
* There are two properties:
* METADATA_PACKAGE_GEN - used for generating metadata
* and METADATA_PACKAGE_LOAD - used for loading the metadata.
- * Most of the time the have the same value, with one exception, during the
+ * Most of the time they have the same value, with one exception, during the
* repackage process scomp needs to load from old package and generate into
* a new package.
*/
@@ -157,14 +157,7 @@
SchemaTypeSystem.class.getName().substring(0, SchemaTypeSystem.class.getName().lastIndexOf(".")) :
stsPackage.getName();
- METADATA_PACKAGE_GEN = (
- // next line should use String addition to avoid replacement by Repackager: "org." + "apache." + "xmlbeans"
- ("org." + "apache." + "xmlbeans").equals(stsPackageName) ?
- // This is the original org apache xmlbeans package, to maintain backwards compatibility resource pathes must remain the same
- "" :
- // This is the private package XMLBeans, all the metadata will end up in a specific/private resource path
- stsPackageName.replaceAll("\\.", "_")
- );
+ METADATA_PACKAGE_GEN = stsPackageName.replaceAll("\\.", "_");
}
private static String nameToPathString(String nameForSystem)
Modified: xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java?rev=190971&r1=190970&r2=190971&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/checkin/CompilationTests.java Thu Jun 16 10:55:04 2005
@@ -455,6 +455,7 @@
}
public static void deltree(File dir)
+ throws InterruptedException
{
if (dir.exists())
{
@@ -465,7 +466,25 @@
deltree(new File(dir, list[i]));
}
if (!dir.delete())
- throw new IllegalStateException("Could not delete " + dir);
+ {
+ for (int i=0; i<5; i++)
+ {
+ try
+ {
+ System.out.println("Sleep 1s and try do delete it again: " + dir.getCanonicalPath());
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace(System.out);
+ }
+ Thread.currentThread().sleep(1000);
+ if (dir.delete())
+ return;
+ }
+
+ if (!dir.delete())
+ throw new IllegalStateException("Could not delete " + dir);
+ }
}
}
}
Modified: xmlbeans/trunk/test/src/compile/scomp/checkin/XmlBeansCompCheckinTests.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/checkin/XmlBeansCompCheckinTests.java?rev=190971&r1=190970&r2=190971&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/checkin/XmlBeansCompCheckinTests.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/checkin/XmlBeansCompCheckinTests.java Thu Jun 16 10:55:04 2005
@@ -43,16 +43,16 @@
{
super(name);
expBinType = new Vector();
- expBinType.add("schema/system/apiCompile/atypedb57type.xsb");
- expBinType.add("schema/system/apiCompile/elname429edoctype.xsb");
- expBinType.add("schema/system/apiCompile/elnameelement.xsb");
- expBinType.add("schema/system/apiCompile/index.xsb");
- expBinType.add("schema/element/http_3A_2F_2Fbaz/elName.xsb");
- expBinType.add("schema/type/http_3A_2F_2Fbaz/aType.xsb");
- expBinType.add("schema/namespace/http_3A_2F_2Fbaz/xmlns.xsb");
- expBinType.add("schema/javaname/baz/ElNameDocument.xsb");
- expBinType.add("schema/javaname/baz/AType.xsb");
- expBinType.add("schema/system/apiCompile/TypeSystemHolder.class");
+ expBinType.add("schemaorg_apache_xmlbeans/system/apiCompile/atypedb57type.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/system/apiCompile/elname429edoctype.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/system/apiCompile/elnameelement.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/system/apiCompile/index.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/element/http_3A_2F_2Fbaz/elName.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/type/http_3A_2F_2Fbaz/aType.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/namespace/http_3A_2F_2Fbaz/xmlns.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/javaname/baz/ElNameDocument.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/javaname/baz/AType.xsb");
+ expBinType.add("schemaorg_apache_xmlbeans/system/apiCompile/TypeSystemHolder.class");
expSrcType = new Vector();
expSrcType.add("baz.AType");
Modified: xmlbeans/trunk/test/src/compile/scomp/common/CompileCommon.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/common/CompileCommon.java?rev=190971&r1=190970&r2=190971&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/common/CompileCommon.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/common/CompileCommon.java Thu Jun 16 10:55:04 2005
@@ -39,7 +39,7 @@
throw new Exception("Act was null");
if (exp.size() != act.size())
- throw new Exception("Size was not the same");
+ throw new Exception("Size was not the same exp.size:" + exp.size() + " act.size:" + act.size());
//use Vector.equals to compare
if (!act.equals(exp))
Modified: xmlbeans/trunk/test/src/compile/scomp/som/common/SomTestBase.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/src/compile/scomp/som/common/SomTestBase.java?rev=190971&r1=190970&r2=190971&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/compile/scomp/som/common/SomTestBase.java (original)
+++ xmlbeans/trunk/test/src/compile/scomp/som/common/SomTestBase.java Thu Jun 16 10:55:04 2005
@@ -310,7 +310,7 @@
public boolean checkPSOMSave(SchemaTypeSystem tgtSTS)
{
- String outDirName = tgtSTS.getName().split("schema.system.")[1];
+ String outDirName = tgtSTS.getName().split("schemaorg_apache_xmlbeans.system.")[1];
String outDirNameWithPath = somOutputRootDir + P + runid + P + outDirName;
// call the save
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org