r1322 - in xwiki-apps/gelc/gelcv1/trunk: . gelc gelcplugins
Ludovic Dubost
ludovic at users.forge.objectweb.org
Fri Sep 15 18:15:55 CEST 2006
Author: ludovic
Date: 2006-09-15 18:15:55 +0200 (Fri, 15 Sep 2006)
New Revision: 1322
Added:
xwiki-apps/gelc/gelcv1/trunk/build.xml
xwiki-apps/gelc/gelcv1/trunk/xwiki.iml
Modified:
xwiki-apps/gelc/gelcv1/trunk/gelc.ipr
xwiki-apps/gelc/gelcv1/trunk/gelc.iws
xwiki-apps/gelc/gelcv1/trunk/gelc/gelc.iml
xwiki-apps/gelc/gelcv1/trunk/gelcplugins/gelcplugins.iml
Log:
New version of the project files
Added: xwiki-apps/gelc/gelcv1/trunk/build.xml
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/build.xml 2006-09-15 13:36:33 UTC (rev 1321)
+++ xwiki-apps/gelc/gelcv1/trunk/build.xml 2006-09-15 16:15:55 UTC (rev 1322)
@@ -0,0 +1,142 @@
+
+<project name="gelc" default="release" basedir=".">
+
+ <property file="${user.home}/build.properties" />
+ <property file="build.properties" />
+
+ <property name="xwiki.dir" value="${basedir}/xwiki" />
+ <property name="build.dir" value="${basedir}/build/gelc" />
+ <property name="release.dir" value="${basedir}/release" />
+ <property name="xwiki.lib" value="${xwiki.dir}/lib" />
+ <property name="lib.dir" value="${basedir}/lib" />
+ <property name="xwiki.jar" value="${release.dir}/xwiki.jar" />
+
+ <property name="gelcplugins.dir" value="${basedir}/gelcplugins" />
+ <property name="gelcplugins.src" value="${gelcplugins.dir}/src/main/java" />
+ <property name="gelcplugins.res" value="${gelcplugins.dir}/src/main/resources" />
+ <property name="gelcplugins.jar" value="${release.dir}/gelcplugins.jar" />
+
+ <property name="gelc.dir" value="${basedir}/gelc" />
+ <property name="gelc.web" value="${gelc.dir}/src/main/web" />
+
+ <property name="webapp.war" value="xwiki.war"/>
+
+
+<!-- groovy setup -->
+
+ <fileset id="libs.groovy.fileset" dir="${xwiki.lib}"
+ includes="groovy-all-1.0-jsr-05.jar" />
+ <fileset id="libs.xwiki.fileset" dir="${xwiki.lib}"
+ includes="*.jar" />
+ <fileset id="libs.gelc.fileset" dir="${lib.dir}"
+ includes="*.jar" />
+ <!-- includes="hibernate-3.0.3.jar,c3p0-0.8.4.5.jar,cglib-2.1.3.jar,dom4j-1.6.1.jar,ehcache-1.1.jar,hibernate-tools-2.1.3.jar,mysql-connector-java-3.1.7-bin.jar,odmg-3.0.jar,oscache-2.3.2M.jar,jgroups-2.2.9.3.jar,swarmcache.jar,xalan-2.6.0.jar,xerces-2.7.1.jar,xml-apis-2.0.2.jar,jta.jar,antlr-2.7.5.jar,asm-1.5.3.jar,asm-util-1.5.3.jar, commons-beanutils-1.7.0.jar,commons-codec-1.3.jar,commons-collections-3.1.jar,commons-dbcp-1.2.1.jar,commons-digester-1.6.jar,commons-fileupload-1.0.jar,commons-lang-2.1.jar,commons-logging-1.0.4.jar,commons-pool-1.1.jar,commons-net-1.1.0.jar,commons-httpclient-2.0.2.jar,ecs-1.4.2.jar,oro-2.0.8.jar,log4j-1.2.8.jar, org.apache.commons.jrcs.rcs.jar, securityfilter-2.0.jar, radeox.jar, velocity-1.4.jar,velocity-tools-1.1.jar, xalan-2.6.0.jar,xerces.jar-2.4.0,xml-apis-2.0.2,jdom-1.0.jar, servlet-api-2.4.jar, portlet.jar, struts-1.2.4.jar, xmlrpc-1.2.jar" /> -->
+
+ <path id="libs.groovy">
+ <fileset refid="libs.groovy.fileset" />
+ <fileset dir="${xwiki.lib}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy">
+ <classpath refid="libs.groovy" />
+ <classpath path="${release.dir}/xwiki.jar" />
+ <classpath path="${build.dir}/web/WEB-INF/classes" />
+ </taskdef>
+
+
+<!-- end of groovy settings -->
+
+ <target name="prepare">
+ <echo message="${user.home}"/>
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${release.dir}" />
+ </target>
+
+ <target name="clean">
+ <delete dir="${build.dir}" />
+ <mkdir dir="${release.dir}" />
+ </target>
+
+ <target name="exportdb">
+ <groovy src="${tools.dir}/export.groovy"/>
+ </target>
+
+ <target name="importdb">
+ <groovy src="${tools.dir}/import.groovy" />
+ </target>
+
+ <target name="xwiki" depends="prepare">
+ <ant antfile="build.xml" target="webapp"
+ dir="${xwiki.dir}" inheritAll="false">
+ <property name="release.dir" value="${build.dir}" />
+ </ant>
+ <mkdir dir="${build.dir}/web" />
+ <copy todir="${build.dir}/web/" overwrite="true">
+ <fileset dir="${gelc.web}">
+ <exclude name="**/web-*.xml" />
+ </fileset>
+ </copy>
+ <move todir="${build.dir}/web/lib/" overwrite="true">
+ <fileset dir="${build.dir}">
+ <include name="xwiki.jar" />
+ </fileset>
+ </move>
+ </target>
+
+ <target name="gelcplugins" depends="xwiki">
+ <mkdir dir="${build.dir}/gelcplugins" />
+ <javac srcdir="${gelcplugins.src.dir}"
+ destdir="${build.dir}/gelcplugins" debug="true"
+ optimize="true" deprecation="true"
+ classpathref="lib.classpath" fork="true">
+ </javac>
+ <jar destfile="${release.dir}/gelcplugins.jar">
+ <!-- classes -->
+ <fileset dir="${classes.dir}">
+ <include name="**/*.class"/>
+ </fileset>
+ <!-- resources -->
+ <fileset dir="${gelcplugins.res.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </jar>
+ </target>
+
+ <target name="gelc" depends="xwiki, gelcplugins">
+ <mkdir dir="${release.dir}" />
+ <war warfile="${release.war}" basedir="${build.dir}/web" webxml="${main.src.dir}/web.xml" >
+ <exclude name="**/web*.xml" />
+ <exclude name="**/xwiki-*.cfg" />
+ <lib refid="libs.gelc.fileset" />
+ <lib refid="libs.xwiki.fileset" />
+ </war>
+ <copy file="${build.dir}/web/WEB-INF/xwiki.cfg" tofile="${build.dir}/web/WEB-INF/xwiki-normal.cfg" overwrite="true" />
+ <copy file="${build.dir}/web/WEB-INF/xwiki-exo.cfg" tofile="${build.dir}/web/WEB-INF/xwiki.cfg" overwrite="true" />
+ <war warfile="${exo.warfile}" basedir="${build.dir}/web" webxml="${main.src.dir}/web-exo.xml" >
+ <exclude name="**/web*.xml" />
+ <exclude name="**/xwiki-*.cfg" />
+ <lib refid="libs.gelc.fileset" />
+ <lib refid="libs.xwiki.fileset" />
+ </war>
+ <copy file="${build.dir}/web/WEB-INF/xwiki-normal.cfg" tofile="${build.dir}/web/WEB-INF/xwiki.cfg" overwrite="true" />
+ </target>
+
+ <target name="release" depends="gelc">
+ <war destfile="${release.dir}/xwiki.war" webxml="${xwiki.dir}/src/main/web.xml">
+ <fileset dir="${build.dir}/web">
+ <exclude name="**/web*.xml" />
+ </fileset>
+ <lib dir="${build.dir}/lib">
+ <include name="*.jar"/>
+ </lib>
+ <lib dir="${lib.dir}">
+ <include name="*.jar"/>
+ </lib>
+ </war>
+ </target>
+</project>
Modified: xwiki-apps/gelc/gelcv1/trunk/gelc/gelc.iml
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelc/gelc.iml 2006-09-15 13:36:33 UTC (rev 1321)
+++ xwiki-apps/gelc/gelcv1/trunk/gelc/gelc.iml 2006-09-15 16:15:55 UTC (rev 1322)
@@ -14,8 +14,9 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="xwiki" level="project" />
<orderEntry type="library" name="Tomcat" level="application_server_libraries" />
- <orderEntry type="module" module-name="xwikibase" />
<orderEntry type="module" module-name="gelcplugins" />
+ <orderEntry type="module" module-name="xwiki" />
+ <orderEntry type="library" name="Tomcat 5.0" level="application" />
<orderEntryProperties />
</component>
<component name="WebModuleBuildComponent">
Modified: xwiki-apps/gelc/gelcv1/trunk/gelc.ipr
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelc.ipr 2006-09-15 13:36:33 UTC (rev 1321)
+++ xwiki-apps/gelc/gelcv1/trunk/gelc.ipr 2006-09-15 16:15:55 UTC (rev 1322)
@@ -268,7 +268,7 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/gelc/gelc.iml" filepath="$PROJECT_DIR$/gelc/gelc.iml" />
<module fileurl="file://$PROJECT_DIR$/gelcplugins/gelcplugins.iml" filepath="$PROJECT_DIR$/gelcplugins/gelcplugins.iml" />
- <module fileurl="file://$PROJECT_DIR$/xwiki/xwikibase.iml" filepath="$PROJECT_DIR$/xwiki/xwikibase.iml" />
+ <module fileurl="file://$PROJECT_DIR$/xwiki.iml" filepath="$PROJECT_DIR$/xwiki.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
@@ -399,8 +399,6 @@
<root url="jar://$PROJECT_DIR$/xwiki/lib/xerces-2.7.1.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/xml-apis-2.0.2.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/xsltc-2.7.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/xwiki/lib/cglib-2.1.3.jar!/" />
- <root url="jar://$PROJECT_DIR$/xwiki/lib/concurrent-1.3.2.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/xmlrpc-common-3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/xmlrpc-client-3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/xmlrpc-server-3.0.jar!/" />
@@ -408,7 +406,6 @@
<root url="jar://$PROJECT_DIR$/xwiki/lib/xmlrpc-server-3.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/xmlrpc-common-3.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/xmlrpc-client-3.0-sources.jar!/" />
- <root url="jar://$PROJECT_DIR$/xwiki/lib/hibernate-3.2rc3.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/antlr-2.7.6.jar!/" />
<root url="jar://$PROJECT_DIR$/xwiki/lib/jcaptcha-all-1.0.jar!/" />
</CLASSES>
Modified: xwiki-apps/gelc/gelcv1/trunk/gelc.iws
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelc.iws 2006-09-15 13:36:33 UTC (rev 1321)
+++ xwiki-apps/gelc/gelcv1/trunk/gelc.iws 2006-09-15 16:15:55 UTC (rev 1322)
@@ -143,21 +143,10 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="XWikiContext.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/xwiki/src/main/java/com/xpn/xwiki/XWikiContext.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="31" column="0" selection-start="1163" selection-end="1163" vertical-scroll-proportion="-0.03629032">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MetaDataFrameworkPlugin.java" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="MetaDataFrameworkPlugin.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/mdfw/MetaDataFrameworkPlugin.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="20" column="1" selection-start="640" selection-end="640" vertical-scroll-proportion="0.875">
+ <state line="13" column="18" selection-start="369" selection-end="369" vertical-scroll-proportion="0.50688076">
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -165,80 +154,6 @@
</provider>
</entry>
</file>
- <file leaf-file-name="UserDirectoryPluginAPI.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/xwiki/src/main/java/com/xpn/xwiki/plugin/userdirectory/UserDirectoryPluginAPI.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="135" column="0" selection-start="5269" selection-end="5269" vertical-scroll-proportion="0.66935486">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MetaDataFrameworkPluginAPI.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/mdfw/MetaDataFrameworkPluginAPI.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="13" column="31" selection-start="329" selection-end="329" vertical-scroll-proportion="0.17741935">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="xwiki.cfg" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/gelc/src/main/web/WEB-INF/xwiki.cfg">
- <provider selected="true" editor-type-id="text-editor">
- <state line="22" column="724" selection-start="1734" selection-end="1734" vertical-scroll-proportion="0.7258065">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="UserDirectoryPlugin.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/xwiki/src/main/java/com/xpn/xwiki/plugin/userdirectory/UserDirectoryPlugin.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="42" column="0" selection-start="952" selection-end="1661" vertical-scroll-proportion="0.9435484">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="gelc" pinned="false" current="false" current-in-tab="false">
- <entry file="j2eedummy://J2EEElement://gelc/J2EE_WEB_MODULE">
- <provider selected="true" editor-type-id="J2EE">
- <state proportions="0.9,0.5,0.5,0.5,0.5" version="1" />
- </provider>
- </entry>
- </file>
- <file leaf-file-name="context.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gelc/src/main/web/META-INF/context.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="3" column="0" selection-start="69" selection-end="69" vertical-scroll-proportion="0.19391635">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="version.properties" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/gelc/src/main/web/WEB-INF/version.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="version.properties" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/xwiki/src/main/web/WEB-INF/version.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1" column="0" selection-start="31" selection-end="48" vertical-scroll-proportion="0.064638786">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -271,7 +186,7 @@
</component>
<component name="JspContextManager" />
<component name="ModuleEditorState">
- <option name="LAST_EDITED_MODULE_NAME" value="gelcplugins" />
+ <option name="LAST_EDITED_MODULE_NAME" value="xwiki" />
<option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" />
</component>
<component name="NamedScopeManager" />
@@ -282,16 +197,10 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="xwikibase" />
+ <option name="myItemId" value="gelcplugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelc.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
</component>
<component name="PerforceChangeBrowserSettings">
<option name="USE_CLIENT_FILTER" value="true" />
@@ -343,30 +252,14 @@
<option name="myItemId" value="gelc.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="gelc.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelcplugins" />
+ <option name="myItemId" value="xwiki" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="gelc.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelcplugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -374,112 +267,16 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="gelcplugins" />
+ <option name="myItemId" value="xwiki" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="gelc.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelcplugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelc.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelcplugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins\src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins\src\main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins\src\main\java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelcplugins\src\main\java\org\gelc\xwiki\plugins\mdfw" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelc.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelc.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelc\src\main\web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelc.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="gelc" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelc\src\main\web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\dev\java\gelc\v1\gelc\src\main\web\WEB-INF" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</component>
<component name="ProjectReloadState">
<option name="STATE" value="0" />
@@ -518,6 +315,22 @@
<component name="RestoreUpdateTree" />
<component name="RunManager">
<activeType name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" />
+ <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ </configuration>
<configuration selected="false" default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -537,15 +350,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration selected="false" default="true" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <module name="" />
- </configuration>
<configuration selected="false" default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
<option name="HOST" value="localhost" />
@@ -555,21 +359,14 @@
<option name="OPEN_IN_BROWSER_URL" value="/" />
<option name="COMMON_VM_ARGUMENTS" value="" />
</configuration>
- <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
+ <configuration selected="false" default="true" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <module name="" />
</configuration>
<configuration selected="false" default="false" name="Tomcat55" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local">
<option name="WORKING_DIRECTORY" />
@@ -584,6 +381,7 @@
<option name="MODULE_NAME" value="gelc" />
<option name="DEPLOY" value="true" />
</J2EE_MODULE>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1261" />
<option name="TRANSPORT" value="0" />
@@ -601,8 +399,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -617,34 +414,34 @@
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="" />
+ <option name="SCRIPT" value="C:\Program Files\apache-tomcat-5.5.17\bin\catalina.bat" />
<option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" run" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="" />
+ <option name="SCRIPT" value="C:\Program Files\apache-tomcat-5.5.17\bin\catalina.bat" />
<option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\Program Files\apache-tomcat-5.5.17\bin\catalina.bat" />
+ <option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value=" run" />
+ <option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
- <option name="SCRIPT" value="C:\Program Files\apache-tomcat-5.5.17\bin\catalina.bat" />
+ <option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value=" stop" />
+ <option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
</configuration>
@@ -661,6 +458,7 @@
<option name="MODULE_NAME" value="gelc" />
<option name="DEPLOY" value="true" />
</J2EE_MODULE>
+ <RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3281" />
<option name="TRANSPORT" value="0" />
@@ -678,8 +476,7 @@
<option name="myDisableAlloc" value="false" />
<option name="myDisableCounts" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -694,7 +491,7 @@
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Debug">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -709,7 +506,7 @@
<option name="PROGRAM_PARAMETERS" value=" stop" />
</SHUTDOWN>
</ConfigurationWrapper>
- <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Run">
+ <ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Profile ">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
@@ -796,22 +593,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="1676" y="-4" width="1032" height="776" extended-state="6" />
- <editor active="false" />
+ <frame x="-4" y="-4" width="1688" height="1024" extended-state="6" />
+ <editor active="true" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32928178" order="7" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.30306122" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.20415647" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.59657323" order="8" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.5955056" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
<window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4657321" order="2" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.46516854" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="4" />
@@ -824,8 +621,8 @@
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
<window_info id="IDE talk" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" />
</layout>
</component>
<component name="VCS.FileViewConfiguration">
@@ -902,16 +699,14 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/gelc/src/main/web/META-INF/context.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="3" column="0" selection-start="69" selection-end="69" vertical-scroll-proportion="0.19391635">
- <folding />
- </state>
+ <entry file="j2eedummy://J2EEElement://gelc/J2EE_WEB_MODULE">
+ <provider selected="true" editor-type-id="J2EE">
+ <state proportions="0.9,0.5,0.5,0.5,0.5" version="1" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/xwiki/src/main/web/WEB-INF/version.properties">
+ <entry file="file://$PROJECT_DIR$/gelc/src/main/web/META-INF/context.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="0" selection-start="31" selection-end="48" vertical-scroll-proportion="0.064638786">
+ <state line="3" column="0" selection-start="69" selection-end="69" vertical-scroll-proportion="0.12259615">
<folding />
</state>
</provider>
@@ -923,61 +718,31 @@
</state>
</provider>
</entry>
- <entry file="j2eedummy://J2EEElement://gelc/J2EE_WEB_MODULE">
- <provider selected="true" editor-type-id="J2EE">
- <state proportions="0.9,0.5,0.5,0.5,0.5" version="1" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/xwiki/src/main/java/com/xpn/xwiki/XWikiContext.java">
+ <entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/mdfw/MetaDataFrameworkPluginAPI.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="0" selection-start="1163" selection-end="1163" vertical-scroll-proportion="-0.03629032">
+ <state line="13" column="31" selection-start="329" selection-end="329" vertical-scroll-proportion="0.53125">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/xwiki/src/main/java/com/xpn/xwiki/plugin/userdirectory/UserDirectoryPlugin.java">
+ <entry file="file://$PROJECT_DIR$/gelc/src/main/web/WEB-INF/xwiki.cfg">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="0" selection-start="952" selection-end="1661" vertical-scroll-proportion="0.9435484">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="22" column="724" selection-start="1734" selection-end="1734" vertical-scroll-proportion="0.042394016">
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/mdfw/MetaDataFrameworkPlugin.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="20" column="1" selection-start="640" selection-end="640" vertical-scroll-proportion="0.875">
+ <state line="13" column="18" selection-start="369" selection-end="369" vertical-scroll-proportion="0.50688076">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/xwiki/src/main/java/com/xpn/xwiki/plugin/userdirectory/UserDirectoryPluginAPI.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="135" column="0" selection-start="5269" selection-end="5269" vertical-scroll-proportion="0.66935486">
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gelcplugins/src/main/java/org/gelc/xwiki/plugins/mdfw/MetaDataFrameworkPluginAPI.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="13" column="31" selection-start="329" selection-end="329" vertical-scroll-proportion="0.17741935">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gelc/src/main/web/WEB-INF/xwiki.cfg">
- <provider selected="true" editor-type-id="text-editor">
- <state line="22" column="724" selection-start="1734" selection-end="1734" vertical-scroll-proportion="0.7258065">
- <folding />
- </state>
- </provider>
- </entry>
</component>
</project>
Modified: xwiki-apps/gelc/gelcv1/trunk/gelcplugins/gelcplugins.iml
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/gelcplugins/gelcplugins.iml 2006-09-15 13:36:33 UTC (rev 1321)
+++ xwiki-apps/gelc/gelcv1/trunk/gelcplugins/gelcplugins.iml 2006-09-15 16:15:55 UTC (rev 1322)
@@ -4,6 +4,7 @@
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/../build/gelc/WEB-INF/classes" />
<exclude-output />
+ <output-test url="file://$MODULE_DIR$/../build/gelctest" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
@@ -13,8 +14,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="xwikibase" />
<orderEntry type="library" name="xwiki" level="project" />
+ <orderEntry type="module" module-name="xwiki" />
+ <orderEntry type="library" name="Tomcat 5.0" level="application" />
<orderEntryProperties />
</component>
</module>
Added: xwiki-apps/gelc/gelcv1/trunk/xwiki.iml
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/xwiki.iml 2006-09-15 13:36:33 UTC (rev 1321)
+++ xwiki-apps/gelc/gelcv1/trunk/xwiki.iml 2006-09-15 16:15:55 UTC (rev 1322)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager">
+ <output url="file://$MODULE_DIR$/build/gelc/WEB-INF/classes" />
+ <exclude-output />
+ <output-test url="file://$MODULE_DIR$/build/xwikitest" />
+ <content url="file://$MODULE_DIR$/xwiki">
+ <sourceFolder url="file://$MODULE_DIR$/xwiki/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/xwiki/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/xwiki/src/test/cactus" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/xwiki/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/xwiki/src/test/resources" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="xwiki" level="project" />
+ <orderEntry type="library" name="Tomcat 5.0" level="application" />
+ <orderEntryProperties />
+ </component>
+</module>
+
More information about the Xwiki-notifications
mailing list