djencks 2005/09/28 22:15:13
Modified: modules/openejb-builder/src/java/org/openejb/deployment/ant
Tag: v2_0_G1M5 DDLExporterTask.java
OpenejbJarLocation.java
Log:
GERONIMO-1027, GERONIMO-957 Merge schema changes from trunk, fix some versions
Revision Changes Path
No revision
No revision
1.1.2.1 +9 -8
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ant/DDLExporterTask.java
Index: DDLExporterTask.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ant/DDLExporterTask.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- DDLExporterTask.java 10 Sep 2005 14:49:07 -0000 1.1
+++ DDLExporterTask.java 29 Sep 2005 02:15:13 -0000 1.1.2.1
@@ -59,6 +59,7 @@
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.geronimo.xbeans.j2ee.EntityBeanType;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -83,7 +84,7 @@
*/
public class DDLExporterTask extends Task {
private static String SCHEMA_NAME = "UNDEFINED";
-
+
private Path classpath;
private EjbJarLocation ejbJarLocation;
private OpenejbJarLocation openejbJarLocation;
@@ -144,7 +145,7 @@
} else if (null == type) {
throw new BuildException("type is required.");
}
-
+
SchemataBuilder schemataBuilder = new SchemataBuilder() {
protected EJBProxyFactory buildEJBProxyFactory(EntityBeanType
entityBean, String remoteInterfaceName, String homeInterfaceName, String
localInterfaceName, String localHomeInterfaceName, ClassLoader cl) throws
DeploymentException {
return null;
@@ -161,7 +162,7 @@
InputStream in = ejbJarLocation.getInputStream(project);
XmlObject xmlObject;
try {
- xmlObject = SchemaConversionUtils.parse(in);
+ xmlObject = XmlBeansUtil.parse(in);
} finally {
in.close();
}
@@ -169,7 +170,7 @@
in = openejbJarLocation.getInputStream(project);
try {
- xmlObject = SchemaConversionUtils.parse(in);
+ xmlObject = XmlBeansUtil.parse(in);
} finally {
in.close();
}
@@ -191,7 +192,7 @@
} catch (Exception e) {
throw new BuildException("Cannot create ddlCommandBuilder", e);
}
-
+
DDLGenerator generator = new DDLGenerator(schemata.getSqlSchema(),
builder);
OutputStream out = null;
try {
@@ -226,5 +227,5 @@
}
}
}
-
+
}
1.1.2.1 +7 -6
openejb/modules/openejb-builder/src/java/org/openejb/deployment/ant/OpenejbJarLocation.java
Index: OpenejbJarLocation.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/ant/OpenejbJarLocation.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- OpenejbJarLocation.java 10 Sep 2005 14:49:07 -0000 1.1
+++ OpenejbJarLocation.java 29 Sep 2005 02:15:13 -0000 1.1.2.1
@@ -51,6 +51,7 @@
import java.util.zip.ZipEntry;
import org.apache.geronimo.deployment.util.NestedJarFile;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -66,7 +67,7 @@
public class OpenejbJarLocation {
private static final String OPENEJB_JAR = "META-INF/openejb-jar.xml";
private static final String GERONIMO_APP =
"META-INF/geronimo-application.xml";
-
+
private final String location;
public OpenejbJarLocation(String location) {
@@ -107,9 +108,9 @@
String name = newLoc.substring(0, newLoc.indexOf("!/"));
in = new FileInputStream(project.resolveFile(name));
}
- XmlObject xmlObject = SchemaConversionUtils.parse(in);
+ XmlObject xmlObject = XmlBeansUtil.parse(in);
int index =
Integer.parseInt(newLoc.substring(newLoc.indexOf("!/") + 2));
-
+
int found = 0;
XmlCursor cursor = xmlObject.newCursor();
try {
@@ -131,7 +132,7 @@
} finally {
cursor.dispose();
}
-
+
throw new BuildException("Only " + found + " openejb-jar DD are
nested.");
}
