xlawrence 2005/11/10 09:13:47 CET
Modified files:
core jahia.iml
Revision Changes Path
1.19 +82 -82 jahia/core/jahia.iml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/jahia.iml.diff?r1=1.18&r2=1.19&f=h
Index: jahia.iml
===================================================================
RCS file: /home/cvs/repository/jahia/core/jahia.iml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jahia.iml 24 Oct 2005 16:01:14 -0000 1.18
+++ jahia.iml 10 Nov 2005 08:13:47 -0000 1.19
@@ -7,9 +7,6 @@
<exploded url="file://$MODULE_DIR$/target/jahia" />
<exclude-exploded />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$/../../corporate_portal_templates">
- <sourceFolder
url="file://$MODULE_DIR$/../../corporate_portal_templates/src/java"
isTestSource="false" />
- </content>
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false"
/>
<sourceFolder url="file://$MODULE_DIR$/src/test/etc"
isTestSource="true" />
@@ -17,6 +14,9 @@
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/target/test-reports" />
</content>
+ <content url="file://$MODULE_DIR$/../../corporate_portal_templates">
+ <sourceFolder
url="file://$MODULE_DIR$/../../corporate_portal_templates/src/java"
isTestSource="false" />
+ </content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
@@ -238,6 +238,15 @@
<orderEntry type="module-library">
<library>
<CLASSES>
+ <root url="jar://$maven-rep$/hsqldb/jars/hsqldb-1.7.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
<root url="jar://$MODULE_DIR$/lib/jackrabbit-0.16.2-dev.jar!/" />
</CLASSES>
<JAVADOC />
@@ -382,6 +391,15 @@
<orderEntry type="module-library">
<library>
<CLASSES>
+ <root url="jar://$maven-rep$/nekohtml/jars/nekohtml-0.9.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
<root url="jar://$maven-rep$/ojb/jars/db-ojb-1.0.1.jar!/" />
</CLASSES>
<JAVADOC />
@@ -499,60 +517,6 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root
url="jar://$maven-rep$/slide/jars/slide-kernel-2.2pre1-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root
url="jar://$maven-rep$/slide/jars/slide-roles-2.2pre1-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root
url="jar://$maven-rep$/slide/jars/slide-stores-2.2pre1-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root
url="jar://$maven-rep$/slide/jars/jakarta-slide-webdavlib-2.2pre1-SNAPSHOT.jar!/"
/>
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root
url="jar://$maven-rep$/slide/jars/slide-webdavservlet-2.2pre1-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root
url="jar://$maven-rep$/slide/jars/slide-log4jlogger-2.2pre1-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
<root url="jar://$maven-rep$/taglibs/jars/standard-1.0.4.jar!/" />
</CLASSES>
<JAVADOC />
@@ -863,10 +827,10 @@
</CLASSES>
<JAVADOC />
<SOURCES>
- <root
url="file://$MODULE_DIR$/../../../technologies/jakarta-svn/jetspeed-2-m3/portal/src/java"
/>
- <root
url="file://$MODULE_DIR$/../../../technologies/jakarta-svn/jetspeed-2-m3/portals-bridges/common/src/java"
/>
- <root
url="file://$MODULE_DIR$/../../../technologies/jakarta-svn/jetspeed-2-m3/commons/src/java"
/>
- <root
url="file://$MODULE_DIR$/../../../technologies/jakarta-svn/jetspeed-2-m3/jetspeed-api/src/java"
/>
+ <root
url="file://C:/technologies/jakarta-svn/jetspeed-2-m3/portal/src/java" />
+ <root
url="file://C:/technologies/jakarta-svn/jetspeed-2-m3/portals-bridges/common/src/java"
/>
+ <root
url="file://C:/technologies/jakarta-svn/jetspeed-2-m3/commons/src/java" />
+ <root
url="file://C:/technologies/jakarta-svn/jetspeed-2-m3/jetspeed-api/src/java" />
</SOURCES>
</library>
</orderEntry>
@@ -1232,6 +1196,43 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="library" name="Tomcat"
level="application_server_libraries" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$maven-rep$/slide/jars/webdavlib-1.0.16.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$maven-rep$/slide/jars/slide-roles-1.0.16.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$maven-rep$/slide/jars/slide-stores-1.0.16.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$maven-rep$/slide/jars/webdav-1.0.16.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -1465,8 +1466,8 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI" value="/WEB-INF/lib/hsqldb-1.7.3.3.jar" />
- <url>jar://$maven-rep$/hsqldb/jars/hsqldb-1.7.3.3.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/hsqldb-1.7.3.0.jar" />
+ <url>jar://$maven-rep$/hsqldb/jars/hsqldb-1.7.3.0.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
@@ -1745,33 +1746,23 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI"
value="/WEB-INF/lib/jakarta-slide-webdavlib-2.2pre1-SNAPSHOT.jar" />
-
<url>jar://$maven-rep$/slide/jars/jakarta-slide-webdavlib-2.2pre1-SNAPSHOT.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI"
value="/WEB-INF/lib/slide-kernel-2.2pre1-SNAPSHOT.jar" />
-
<url>jar://$maven-rep$/slide/jars/slide-kernel-2.2pre1-SNAPSHOT.jar!/</url>
- </containerElement>
- <containerElement type="library" level="module">
- <attribute name="method" value="1" />
- <attribute name="URI"
value="/WEB-INF/lib/slide-log4jlogger-2.2pre1-SNAPSHOT.jar" />
-
<url>jar://$maven-rep$/slide/jars/slide-log4jlogger-2.2pre1-SNAPSHOT.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/slide-roles-1.0.16.jar" />
+ <url>jar://$maven-rep$/slide/jars/slide-roles-1.0.16.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI"
value="/WEB-INF/lib/slide-roles-2.2pre1-SNAPSHOT.jar" />
-
<url>jar://$maven-rep$/slide/jars/slide-roles-2.2pre1-SNAPSHOT.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/slide-stores-1.0.16.jar" />
+ <url>jar://$maven-rep$/slide/jars/slide-stores-1.0.16.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI"
value="/WEB-INF/lib/slide-stores-2.2pre1-SNAPSHOT.jar" />
-
<url>jar://$maven-rep$/slide/jars/slide-stores-2.2pre1-SNAPSHOT.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/webdav-1.0.16.jar" />
+ <url>jar://$maven-rep$/slide/jars/webdav-1.0.16.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
- <attribute name="URI"
value="/WEB-INF/lib/slide-webdavservlet-2.2pre1-SNAPSHOT.jar" />
-
<url>jar://$maven-rep$/slide/jars/slide-webdavservlet-2.2pre1-SNAPSHOT.jar!/</url>
+ <attribute name="URI" value="/WEB-INF/lib/webdavlib-1.0.16.jar" />
+ <url>jar://$maven-rep$/slide/jars/webdavlib-1.0.16.jar!/</url>
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
@@ -1860,6 +1851,11 @@
</containerElement>
<containerElement type="library" level="module">
<attribute name="method" value="1" />
+ <attribute name="URI" value="/WEB-INF/lib/slide-kernel-2.2pre1.jar" />
+ <url>jar://$MODULE_DIR$/lib/slide-kernel-2.2pre1.jar!/</url>
+ </containerElement>
+ <containerElement type="library" level="module">
+ <attribute name="method" value="1" />
<attribute name="URI" value="/WEB-INF/lib/tm-extractors-0.4.jar" />
<url>jar://$MODULE_DIR$/lib/tm-extractors-0.4.jar!/</url>
</containerElement>
@@ -1878,7 +1874,11 @@
<attribute name="URI" value="/WEB-INF/lib" />
</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$/src/conf/metadata/jahia-tomcat5.5.xml" version="5.x" />
+ <deploymentDescriptor name="context.xml"
url="file://$MODULE_DIR$/META-INF/context.xml" version="5.x" />
+ <deploymentDescriptor name=""
url="file://$MODULE_DIR$/src/conf/metadata/jahia-tomcat5.5.xml">
+ <option name="NAME" value="" />
+ <option name="DESCRIPTION" value="" />
+ </deploymentDescriptor>
<webroots>
<root url="file://$MODULE_DIR$/src/webapp" relative="/" />
<root url="file://$MODULE_DIR$/src/webapp/WEB-INF" relative="/WEB-INF"
/>
