shuber 2005/08/21 18:13:42 CEST
Modified files:
core jahia.iml jahia.ipr
core/src/java/org/jahia/engines/importexport
ManageContentPicker.java
Log:
Removed unused import that referenced erased file
Revision Changes Path
1.9 +114 -1 jahia/core/jahia.iml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/jahia.iml.diff?r1=1.8&r2=1.9&f=h
1.5 +1 -1 jahia/core/jahia.ipr
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/jahia.ipr.diff?r1=1.4&r2=1.5&f=h
1.10 +0 -1
jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java.diff?r1=1.9&r2=1.10&f=h
Index: jahia.iml
===================================================================
RCS file: /home/cvs/repository/jahia/core/jahia.iml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jahia.iml 19 Aug 2005 15:36:27 -0000 1.8
+++ jahia.iml 21 Aug 2005 16:13:41 -0000 1.9
@@ -1116,7 +1116,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="Tomcat"
level="application_server_libraries" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -1144,6 +1143,79 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="Tomcat"
level="application_server_libraries" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/filterbuilder.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/htmlparser.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/checkstyle-all-3.1.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/sax2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/fit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/htmllexer.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/thumbelina.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$maven-rep$/jahia/jars/clipBuilder-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
@@ -1353,6 +1425,11 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/clipBuilder-1.0.jar" />
+ <url>jar://$maven-rep$/jahia/jars/clipBuilder-1.0.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/taglibs-cache-1.2.jar" />
<url>jar://$maven-rep$/jakarta-cache/jars/taglibs-cache-1.2.jar!/</url>
</containerElement>
@@ -1753,10 +1830,46 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/checkstyle-all-3.1.jar" />
+
<url>jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/checkstyle-all-3.1.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/filterbuilder.jar" />
+
<url>jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/filterbuilder.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/fit.jar" />
+ <url>jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/fit.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/htmllexer.jar" />
+
<url>jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/htmllexer.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/htmlparser.jar" />
+
<url>jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/htmlparser.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/sax2.jar" />
+ <url>jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/sax2.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/thumbelina.jar" />
+
<url>jar://$MODULE_DIR$/lib/webclip_builder/htmlParser/thumbelina.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/xml-writer-0.2.jar" />
<url>jar://$MODULE_DIR$/lib/xml-writer-0.2.jar!/</url>
</containerElement>
<deploymentDescriptor name="web.xml"
url="file://$MODULE_DIR$/src/webapp/WEB-INF/web.xml" version="2.3" />
+ <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" version="5.x" />
<webroots>
<root url="file://$MODULE_DIR$/src/webapp" relative="/" />
<root url="file://$MODULE_DIR$/src/webapp/WEB-INF" relative="/WEB-INF"
/>
Index: jahia.ipr
===================================================================
RCS file: /home/cvs/repository/jahia/core/jahia.ipr,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jahia.ipr 8 Aug 2005 16:31:45 -0000 1.4
+++ jahia.ipr 21 Aug 2005 16:13:41 -0000 1.5
@@ -198,7 +198,7 @@
<module fileurl="file://$PROJECT_DIR$/jahia.iml"
filepath="$PROJECT_DIR$/jahia.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true"
jdk-15="true" project-jdk-name="java version "1.4.2_05"" />
+ <component name="ProjectRootManager" version="2" assert-keyword="true"
jdk-15="true" project-jdk-name="1.4" />
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />
Index: ManageContentPicker.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ManageContentPicker.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ManageContentPicker.java 19 Aug 2005 15:11:26 -0000 1.9
+++ ManageContentPicker.java 21 Aug 2005 16:13:42 -0000 1.10
@@ -20,7 +20,6 @@
import org.jahia.services.importexport.ImportExportBaseService;
import org.jahia.services.importexport.ImportExportService;
import org.jahia.services.importexport.ImportHandler;
-import org.jahia.services.importexport.DiffImportHandler;
import org.jahia.services.search.*;
import org.jahia.services.sites.SiteLanguageSettings;
import org.jahia.services.version.EntryLoadRequest;
