Update of
/var/cvs/applications/packaging/src/org/mmbase/applications/packaging/packagehandlers
In directory
james.mmbase.org:/tmp/cvs-serv21264/src/org/mmbase/applications/packaging/packagehandlers
Modified Files:
BasicPackage.java CloudModelPackage.java DataApps1Package.java
FunctionSetPackage.java
Log Message:
did find&replace to make code not use now deprecated XMLEntityResolver,
XMLErrorHandler
See also:
http://cvs.mmbase.org/viewcvs/applications/packaging/src/org/mmbase/applications/packaging/packagehandlers
Index: BasicPackage.java
===================================================================
RCS file:
/var/cvs/applications/packaging/src/org/mmbase/applications/packaging/packagehandlers/BasicPackage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- BasicPackage.java 21 Jun 2007 15:50:21 -0000 1.9
+++ BasicPackage.java 4 Sep 2008 06:01:04 -0000 1.10
@@ -26,7 +26,7 @@
import org.mmbase.applications.packaging.util.ExtendedDocumentReader;
import org.mmbase.module.builders.Versions;
import org.mmbase.module.core.MMBase;
-import org.mmbase.util.XMLEntityResolver;
+import org.mmbase.util.xml.EntityResolver;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
import org.w3c.dom.Element;
@@ -95,11 +95,11 @@
/**
* Register the Public Ids for DTDs used by DatabaseReader
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerPublicIDs() {
- XMLEntityResolver.registerPublicID(PUBLIC_ID_PACKAGEDEPENDS_1_0,
DTD_PACKAGEDEPENDS_1_0, ShareManager.class);
- XMLEntityResolver.registerPublicID(PUBLIC_ID_PACKAGE_1_0,
DTD_PACKAGE_1_0, DiskProvider.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_PACKAGEDEPENDS_1_0,
DTD_PACKAGEDEPENDS_1_0, ShareManager.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_PACKAGE_1_0,
DTD_PACKAGE_1_0, DiskProvider.class);
}
Index: CloudModelPackage.java
===================================================================
RCS file:
/var/cvs/applications/packaging/src/org/mmbase/applications/packaging/packagehandlers/CloudModelPackage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CloudModelPackage.java 8 Mar 2007 08:51:37 -0000 1.12
+++ CloudModelPackage.java 4 Sep 2008 06:01:04 -0000 1.13
@@ -18,7 +18,7 @@
import org.mmbase.module.corebuilders.RelDef;
import org.mmbase.module.corebuilders.TypeDef;
import org.mmbase.module.corebuilders.TypeRel;
-import org.mmbase.util.XMLEntityResolver;
+import org.mmbase.util.xml.EntityResolver;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
import org.w3c.dom.Element;
@@ -46,10 +46,10 @@
/**
* Register the Public Ids for DTDs used by DatabaseReader
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerPublicIDs() {
- XMLEntityResolver.registerPublicID(PUBLIC_ID_CLOUDMODEL_1_0,
DTD_CLOUDMODEL_1_0, CloudModelPackage.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_CLOUDMODEL_1_0,
DTD_CLOUDMODEL_1_0, CloudModelPackage.class);
}
Index: DataApps1Package.java
===================================================================
RCS file:
/var/cvs/applications/packaging/src/org/mmbase/applications/packaging/packagehandlers/DataApps1Package.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- DataApps1Package.java 21 Jun 2007 15:50:21 -0000 1.9
+++ DataApps1Package.java 4 Sep 2008 06:01:04 -0000 1.10
@@ -22,7 +22,7 @@
import org.mmbase.core.CoreField;
import org.mmbase.module.corebuilders.InsRel;
import org.mmbase.module.corebuilders.RelDef;
-import org.mmbase.util.XMLEntityResolver;
+import org.mmbase.util.xml.EntityResolver;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
import org.w3c.dom.Element;
@@ -65,12 +65,12 @@
/**
* Register the Public Ids for DTDs used by DatabaseReader
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerPublicIDs() {
- XMLEntityResolver.registerPublicID(PUBLIC_ID_DATASET_1_0,
DTD_DATASET_1_0, DataApps1Package.class);
- XMLEntityResolver.registerPublicID(PUBLIC_ID_OBJECTSET_1_0,
DTD_OBJECTSET_1_0, DataApps1Package.class);
- XMLEntityResolver.registerPublicID(PUBLIC_ID_RELATIONSET_1_0,
DTD_RELATIONSET_1_0, DataApps1Package.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_DATASET_1_0,
DTD_DATASET_1_0, DataApps1Package.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_OBJECTSET_1_0,
DTD_OBJECTSET_1_0, DataApps1Package.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_RELATIONSET_1_0,
DTD_RELATIONSET_1_0, DataApps1Package.class);
}
Index: FunctionSetPackage.java
===================================================================
RCS file:
/var/cvs/applications/packaging/src/org/mmbase/applications/packaging/packagehandlers/FunctionSetPackage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- FunctionSetPackage.java 8 Mar 2007 08:51:37 -0000 1.7
+++ FunctionSetPackage.java 4 Sep 2008 06:01:04 -0000 1.8
@@ -18,7 +18,7 @@
import org.mmbase.applications.packaging.PackageManager;
import org.mmbase.applications.packaging.installhandlers.installStep;
import org.mmbase.applications.packaging.util.ExtendedDocumentReader;
-import org.mmbase.util.XMLEntityResolver;
+import org.mmbase.util.xml.EntityResolver;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
import org.w3c.dom.Element;
@@ -46,10 +46,10 @@
/**
* Register the Public Ids for DTDs used by DatabaseReader
- * This method is called by XMLEntityResolver.
+ * This method is called by EntityResolver.
*/
public static void registerPublicIDs() {
- XMLEntityResolver.registerPublicID(PUBLIC_ID_FUNCTIONSETS_1_0,
DTD_FUNCTIONSETS_1_0, FunctionSetPackage.class);
+ EntityResolver.registerPublicID(PUBLIC_ID_FUNCTIONSETS_1_0,
DTD_FUNCTIONSETS_1_0, FunctionSetPackage.class);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
