You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ob...@apache.org on 2004/04/29 23:23:42 UTC
cvs commit: avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/core/resource JavaDocResource.java
oberhack 2004/04/29 14:23:42
Modified: ide/org.apache.avalon.ide.eclipse.core build.properties
plugin.xml .classpath
ide/org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/core/resource
JavaDocResource.java
Added: ide/org.apache.avalon.ide.eclipse.core build.xml
Removed: ide/org.apache.avalon.ide.eclipse.core deploy_local.jardesc
Log:
Revision Changes Path
1.2 +9 -2 avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties 26 Jan 2004 08:36:49 -0000 1.1
+++ build.properties 29 Apr 2004 21:23:41 -0000 1.2
@@ -1,4 +1,11 @@
-source.MerlinDeveloperCore.jar = src/
bin.includes = plugin.xml,\
*.jar,\
- MerlinDeveloperCore.jar
+ MerlinDeveloperCore.jar,\
+ lib/,\
+ docs/,\
+ toc.xml
+source.MerlinDeveloperCore.jar = src/
+src.includes = src/,\
+ toc.xml,\
+ plugin.xml,\
+ docs/
1.6 +3 -3 avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/plugin.xml
Index: plugin.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/plugin.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.xml 29 Mar 2004 18:28:48 -0000 1.5
+++ plugin.xml 29 Apr 2004 21:23:41 -0000 1.6
@@ -2,12 +2,12 @@
<plugin
id="org.apache.avalon.MerlinDeveloperCore"
name="MerlinDeveloper Core"
- version="0.0.2"
+ version="0.0.4"
provider-name="Apache Software Foundation"
class="org.apache.avalon.ide.eclipse.merlin.core.MerlinDeveloperCore">
<runtime>
- <library name="MerlinDeveloperCore.jar">
+ <library name="MerlinDeveloperCore.jar">
<export name="*"/>
</library>
<library name="lib/xstream-0.2.jar"/>
@@ -26,7 +26,7 @@
<import plugin="org.eclipse.core.boot"/>
<import plugin="org.junit"/>
</requires>
-
+
<extension
point="org.eclipse.help.toc">
1.6 +12 -7 avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/.classpath,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .classpath 2 Mar 2004 13:12:35 -0000 1.5
+++ .classpath 29 Apr 2004 21:23:41 -0000 1.6
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="lib/xstream-0.2.jar"/>
- <classpathentry kind="lib" path="lib/xdoclet-1.2b4.jar"/>
- <classpathentry kind="lib" path="lib/xjavadoc-1.0.jar"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="lib" path="lib/xstream-0.2.jar"/>
+ <classpathentry kind="lib" path="lib/xdoclet-1.2b4.jar"/>
+ <classpathentry kind="lib" path="lib/xjavadoc-1.0.jar"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="C:/develop/merlin/merlin3.2.5/system/avalon-repository/jars/avalon-repository-util-1.2.jar"/>
+ <classpathentry kind="lib" path="C:/develop/merlin/merlin3.2.5/system/avalon-repository/jars/avalon-repository-api-1.2.jar"/>
+ <classpathentry kind="lib" path="C:/develop/merlin/merlin3.2.5/system/avalon-repository/jars/avalon-repository-impl-1.2.jar"/>
+ <classpathentry kind="lib" path="C:/develop/merlin/merlin3.2.5/system/avalon-repository/jars/avalon-repository-main-1.2.jar"/>
+ <classpathentry kind="lib" path="C:/develop/merlin/merlin3.2.5/system/avalon-repository/jars/avalon-repository-spi-1.2.jar"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
1.1 avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/build.xml
Index: build.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.apache.avalon.MerlinDeveloperCore" default="build.jars" basedir=".">
<property name="bootclasspath" value=""/>
<property name="basews" value="${ws}"/>
<property name="baseos" value="${os}"/>
<property name="basearch" value="${arch}"/>
<property name="basenl" value="${nl}"/>
<property name="javacFailOnError" value="false"/>
<property name="javacDebugInfo" value="on"/>
<property name="javacVerbose" value="true"/>
<property name="javacSource" value="1.3"/>
<property name="javacTarget" value="1.1"/>
<target name="init" depends="properties">
<property name="temp.folder" value="${basedir}/temp.folder"/>
<property name="plugin.destination" value="${basedir}"/>
<property name="build.result.folder" value="${basedir}"/>
</target>
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
</target>
<target name="build.update.jar" depends="init" description="Build the plug-in: org.apache.avalon.MerlinDeveloperCore for an update site.">
<delete dir="${temp.folder}"/>
<mkdir dir="${temp.folder}"/>
<antcall target="build.jars"/>
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
</antcall>
<zip zipfile="${plugin.destination}/org.apache.avalon.MerlinDeveloperCore_0.0.4.jar" basedir="${temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4" filesonly="false" whenempty="skip"/>
<delete dir="${temp.folder}"/>
</target>
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4"/>
<copy todir="${destination.temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4">
<fileset dir="${build.result.folder}" includes="plugin.xml,*.jar,MerlinDeveloperCore.jar,lib/,docs/,toc.xml" />
</copy>
<copy todir="${destination.temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4">
<fileset dir="${basedir}" includes="plugin.xml,*.jar,MerlinDeveloperCore.jar,lib/,docs/,toc.xml" />
</copy>
</target>
<target name="MerlinDeveloperCore.jar" depends="init" unless="MerlinDeveloperCore.jar" description="Create jar: MerlinDeveloperCore.jar.">
<delete dir="${temp.folder}/MerlinDeveloperCore.jar.bin"/>
<mkdir dir="${temp.folder}/MerlinDeveloperCore.jar.bin"/>
<!-- compile the source code -->
<javac destdir="${temp.folder}/MerlinDeveloperCore.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bootclasspath}" classpath="../../plugins/org.eclipse.core.boot_3.0.0/boot.jar;lib/xstream-0.2.jar;lib/xdoclet-1.2b4.jar;lib/xjavadoc-1.0.jar;lib/commons-collections-2.0.jar;lib/commons-lang.jar;lib/commons-logging.jar;../../plugins/org.eclipse.core.runtime_3.0.0/runtime.jar;../../plugins/org.eclipse.core.resources_3.0.0/resources.jar;../../plugins/org.eclipse.core.resources.win32_3.0.0/resources.jar;../../plugins/org.eclipse.ui_3.0.0/ui.jar;../../plugins/org.eclipse.help_3.0.0/help.jar;../../plugins/org.eclipse.swt_3.0.0/ws/${basews}/swt.jar;../../plugins/org.eclipse.swt.win32_3.0.0/ws/${basews}/swt.jar;../../plugins/org.eclipse.jface_3.0.0/jface.jar;../../plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar;../../plugins/org.eclipse.jdt.core_3.0.0/jdtcore.jar;../../plugins/com.swtdesigner.fragment.jdt.core_1.2.2/jdtcore.jar;../../plugins/com.swtdesigner.fragment.jdt.core_1.2.2/designerJdtCore.jar;../../plugins/org.eclipse.text_3.0.0/text.jar;../../plugins/org.eclipse.ant.core_3.0.0/antsupport.jar;../../plugins/org.eclipse.core.variables_3.0.0/variables.jar;../../plugins/org.eclipse.team.core_3.0.0/team.jar;../../plugins/org.eclipse.jdt.launching_3.0.0/launching.jar;../../plugins/org.eclipse.debug.core_3.0.0/dtcore.jar;../../plugins/org.eclipse.jdt.debug_3.0.0/jdi.jar;../../plugins/org.eclipse.jdt.debug_3.0.0/jdimodel.jar;../../plugins/org.eclipse.jdt.debug_3.0.0/tools.jar;../../plugins/org.junit_3.8.1/junit.jar" source="${javacSource}" target="${javacTarget}" >
<src path="src/" />
</javac>
<!-- copy necessary resources -->
<copy todir="${temp.folder}/MerlinDeveloperCore.jar.bin">
<fileset dir="src/" excludes="**/*.java" />
</copy>
<mkdir dir="${build.result.folder}"/>
<jar jarfile="${build.result.folder}/MerlinDeveloperCore.jar" basedir="${temp.folder}/MerlinDeveloperCore.jar.bin"/>
<delete dir="${temp.folder}/MerlinDeveloperCore.jar.bin"/>
</target>
<target name="MerlinDeveloperCoresrc.zip" depends="init" unless="MerlinDeveloperCoresrc.zip">
<mkdir dir="${build.result.folder}"/>
<zip zipfile="${build.result.folder}/MerlinDeveloperCoresrc.zip" filesonly="false" whenempty="skip">
<fileset dir="src/" includes="**/*.java" />
</zip>
</target>
<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.apache.avalon.MerlinDeveloperCore.">
<available property="MerlinDeveloperCore.jar" file="${build.result.folder}/MerlinDeveloperCore.jar"/>
<antcall target="MerlinDeveloperCore.jar"/>
</target>
<target name="build.sources" depends="init">
<available property="MerlinDeveloperCoresrc.zip" file="${build.result.folder}/MerlinDeveloperCoresrc.zip"/>
<antcall target="MerlinDeveloperCoresrc.zip"/>
</target>
<target name="build.zips" depends="init">
</target>
<target name="gather.sources" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4"/>
<copy file="${build.result.folder}/MerlinDeveloperCoresrc.zip" todir="${destination.temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4"/>
<copy todir="${destination.temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4">
<fileset dir="${basedir}" includes="src/,toc.xml,plugin.xml,docs/" />
</copy>
</target>
<target name="gather.logs" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4"/>
<copy file="${temp.folder}/MerlinDeveloperCore.jar.bin.log" todir="${destination.temp.folder}/org.apache.avalon.MerlinDeveloperCore_0.0.4"/>
</target>
<target name="clean" depends="init" description="Clean the plug-in: org.apache.avalon.MerlinDeveloperCore of all the zips, jars and logs created.">
<delete file="${build.result.folder}/MerlinDeveloperCore.jar"/>
<delete file="${build.result.folder}/MerlinDeveloperCoresrc.zip"/>
<delete file="${plugin.destination}/org.apache.avalon.MerlinDeveloperCore_0.0.4.jar"/>
<delete file="${plugin.destination}/org.apache.avalon.MerlinDeveloperCore_0.0.4.zip"/>
<delete dir="${temp.folder}"/>
</target>
<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
<eclipse.convertPath fileSystemPath="C:/develop/eclipse/workspace/org.apache.avalon.ide.eclipse.core/" property="resourcePath"/>
<eclipse.refreshLocal resource="org.apache.avalon.MerlinDeveloperCore" depth="infinite"/>
</target>
<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.apache.avalon.MerlinDeveloperCore.">
<delete dir="${temp.folder}"/>
<mkdir dir="${temp.folder}"/>
<antcall target="build.jars"/>
<antcall target="build.sources"/>
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
</antcall>
<antcall target="gather.sources">
<param name="destination.temp.folder" value="${temp.folder}/"/>
</antcall>
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin.log" />
</delete>
<zip zipfile="${plugin.destination}/org.apache.avalon.MerlinDeveloperCore_0.0.4.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip"/>
<delete dir="${temp.folder}"/>
</target>
</project>
1.4 +6 -3 avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/core/resource/JavaDocResource.java
Index: JavaDocResource.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.core/src/org/apache/avalon/ide/eclipse/core/resource/JavaDocResource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaDocResource.java 29 Mar 2004 18:29:34 -0000 1.3
+++ JavaDocResource.java 29 Apr 2004 21:23:42 -0000 1.4
@@ -64,7 +64,10 @@
xClass = clazz;
}
-
+ public static void createJavaDocCache(IProject project)
+ {
+ docCache = getJavaDocResources(project);
+ }
/**
* Collects all java source files of a project. If it is not possible to
* retrieve the corresponding project of 'element' throw an exception.
@@ -102,8 +105,8 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
- docCache = (JavaDocResource[]) infoList.toArray(new JavaDocResource[infoList.size()]);
- return docCache;
+
+ return (JavaDocResource[]) infoList.toArray(new JavaDocResource[infoList.size()]);
}
public static JavaDocResource getJavaDocResource(String qualifiedClassName)
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org