dion 2003/03/30 08:01:19 Modified: src/plugins-build/jdeveloper plugin.jelly Log: Explicity use ant name space. In prep for removal of jeez etc Revision Changes Path 1.4 +250 -251 maven/src/plugins-build/jdeveloper/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven/src/plugins-build/jdeveloper/plugin.jelly,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plugin.jelly 30 Mar 2003 15:42:49 -0000 1.3 +++ plugin.jelly 30 Mar 2003 16:01:19 -0000 1.4 @@ -18,159 +18,159 @@ description="Generate jdeveloper .jpr"> <ant:echo>Creating ${basedir}/${pom.artifactId}.jpr...</ant:echo> - <!-- - We use the JavaSourceTool to get the relative path - --> - <j:useBean var="javaSourceTool" class="org.apache.maven.jdeveloper.JavaSourceTool"/> - <j:file name="${basedir}/${pom.artifactId}.jpr" prettyPrint="true" xmlns="http://xmlns.oracle.com/jdeveloper/903/jproject" encoding="Cp1252"> - <project nselem="project" class="oracle.jdeveloper.model.JProject"> - <defaultPackage>${pom.package}</defaultPackage> - <defaultPackages class="java.util.ArrayList"> + <!-- + We use the JavaSourceTool to get the relative path + --> + <j:useBean var="javaSourceTool" class="org.apache.maven.jdeveloper.JavaSourceTool"/> + <j:file name="${basedir}/${pom.artifactId}.jpr" prettyPrint="true" xmlns="http://xmlns.oracle.com/jdeveloper/903/jproject" encoding="Cp1252"> + <project nselem="project" class="oracle.jdeveloper.model.JProject"> + <defaultPackage>${pom.package}</defaultPackage> + <defaultPackages class="java.util.ArrayList"> <Item class="java.lang.String">${pom.package}</Item> - </defaultPackages> - <dependencyList/> - <htmlRootDirectory path="target/docs/"/> - <j2eeWebAppName>${maven.jdeveloper.workspace}-${maven.war.final.name}</j2eeWebAppName> - <j2eeWebContextRoot>${maven.jdeveloper.workspace}-${ear.bundle.war.context-root}</j2eeWebContextRoot> - <listOfChildren class="oracle.ide.model.DataList"> - <!-- Add Java Sources --> - <j:forEach var="file" items="${javaSourceFiles.iterator()}"> - <j:set var="packagePath" value="${javaSourceTool.getPackagePath(file.toString())}"/> - <util:replace var="path" oldChar="\" newChar="/" value="${packagePath}"/> - <Item class="oracle.jdeveloper.model.JavaSourceNode"> - <URL path="${pom.build.sourceDirectory}/${path}"/> - </Item> - </j:forEach> - <!-- Add test Sources --> - <j:forEach var="file" items="${unitTestSourceFiles.iterator()}"> - <j:set var="packagePath" value="${javaSourceTool.getPackagePath(file.toString())}"/> - <util:replace var="path" oldChar="\" newChar="/" value="${packagePath}"/> - <Item class="oracle.jdeveloper.model.JavaSourceNode"> - <URL path="${pom.build.sourceDirectory}/${path}"/> - </Item> - </j:forEach> - <!-- Add integration test Sources --> - <j:forEach var="file" items="${integrationTestSourceFiles.iterator()}"> - <j:set var="packagePath" value="${javaSourceTool.getPackagePath(file.toString())}"/> - <util:replace var="path" oldChar="\" newChar="/" value="${packagePath}"/> - <Item class="oracle.jdeveloper.model.JavaSourceNode"> - <URL path="${pom.build.sourceDirectory}/${path}"/> - </Item> - </j:forEach> - <j:forEach var="file" items="${javaDocFiles.iterator()}"> - <Item class="oracle.jdevimpl.webapp.html.HtmlSourceNode"> - <URL path="${file.getPath()}"/> - </Item> - </j:forEach> - </listOfChildren> - <ownerMap/> - <projectDocPath> - <entries class="[Ljava.net.URL;"/> - </projectDocPath> - <projectLibraryList class="oracle.jdeveloper.library.JProjectLibraryList"> - <jdkList class="java.util.ArrayList"/> - <libraryList class="java.util.ArrayList"> - <j:forEach var="lib" items="${pom.artifacts}"> - <Item class="oracle.jdeveloper.library.JLibrary"> - <defaultLibraryDefinition> - <JDKVersion/> - <classPath> - <entries> - <Item path="${maven.jdeveloper.relative.path}/${maven.jdeveloper.maven.home}/repository/${lib.dependency.artifactId}/jars/${lib.name}" jar-entry=""/> - </entries> - </classPath> - <docPath> - <entries class="[Ljava.net.URL;"/> - </docPath> - <locked>false</locked> - <sourcePath> - <entries class="[Ljava.net.URL;"/> - </sourcePath> - </defaultLibraryDefinition> - <definitionList class="java.util.ArrayList"/> - <locked>false</locked> - <name>${lib.dependency.artifactId}</name> - </Item> - </j:forEach> - </libraryList> - </projectLibraryList> - <projectSettings> - <activeConfigName>Development</activeConfigName> - <commonData class="java.util.HashMap"> - <Item> - <Key>oracle.bm.commonIde.data.project.ModelerProjectSettings</Key> - <Value class="oracle.bm.commonIde.data.project.ModelerProjectSettings"> - <modelersPath> - <entries> - <Item path="model/"/> - </entries> - </modelersPath> - </Value> - </Item> - <Item> - <Key>oracle.jdeveloper.compiler.ant.AntConfiguration</Key> - <Value class="oracle.jdeveloper.compiler.ant.AntConfiguration"> - <arguments class="java.lang.String"/> - <makeTarget/> - <projectBuildfile/> - <rebuildTarget/> - <showOutput>true</showOutput> - </Value> - </Item> - </commonData> - <configurations class="java.util.TreeMap"> - <Item> - <Key>Development</Key> - <Value class="oracle.jdeveloper.model.JProjectConfiguration"> - <configData class="java.util.HashMap"> - <Item> - <Key>oracle.jdeveloper.compiler.OjcConfiguration</Key> - <Value class="oracle.jdeveloper.compiler.OjcConfiguration"> - <assertionsEnabled>false</assertionsEnabled> - <copyRes> + </defaultPackages> + <dependencyList/> + <htmlRootDirectory path="target/docs/"/> + <j2eeWebAppName>${maven.jdeveloper.workspace}-${maven.war.final.name}</j2eeWebAppName> + <j2eeWebContextRoot>${maven.jdeveloper.workspace}-${ear.bundle.war.context-root}</j2eeWebContextRoot> + <listOfChildren class="oracle.ide.model.DataList"> + <!-- Add Java Sources --> + <j:forEach var="file" items="${javaSourceFiles.iterator()}"> + <j:set var="packagePath" value="${javaSourceTool.getPackagePath(file.toString())}"/> + <util:replace var="path" oldChar="\" newChar="/" value="${packagePath}"/> + <Item class="oracle.jdeveloper.model.JavaSourceNode"> + <URL path="${pom.build.sourceDirectory}/${path}"/> + </Item> + </j:forEach> + <!-- Add test Sources --> + <j:forEach var="file" items="${unitTestSourceFiles.iterator()}"> + <j:set var="packagePath" value="${javaSourceTool.getPackagePath(file.toString())}"/> + <util:replace var="path" oldChar="\" newChar="/" value="${packagePath}"/> + <Item class="oracle.jdeveloper.model.JavaSourceNode"> + <URL path="${pom.build.sourceDirectory}/${path}"/> + </Item> + </j:forEach> + <!-- Add integration test Sources --> + <j:forEach var="file" items="${integrationTestSourceFiles.iterator()}"> + <j:set var="packagePath" value="${javaSourceTool.getPackagePath(file.toString())}"/> + <util:replace var="path" oldChar="\" newChar="/" value="${packagePath}"/> + <Item class="oracle.jdeveloper.model.JavaSourceNode"> + <URL path="${pom.build.sourceDirectory}/${path}"/> + </Item> + </j:forEach> + <j:forEach var="file" items="${javaDocFiles.iterator()}"> + <Item class="oracle.jdevimpl.webapp.html.HtmlSourceNode"> + <URL path="${file.getPath()}"/> + </Item> + </j:forEach> + </listOfChildren> + <ownerMap/> + <projectDocPath> + <entries class="[Ljava.net.URL;"/> + </projectDocPath> + <projectLibraryList class="oracle.jdeveloper.library.JProjectLibraryList"> + <jdkList class="java.util.ArrayList"/> + <libraryList class="java.util.ArrayList"> + <j:forEach var="lib" items="${pom.artifacts}"> + <Item class="oracle.jdeveloper.library.JLibrary"> + <defaultLibraryDefinition> + <JDKVersion/> + <classPath> + <entries> + <Item path="${maven.jdeveloper.relative.path}/${maven.jdeveloper.maven.home}/repository/${lib.dependency.artifactId}/jars/${lib.name}" jar-entry=""/> + </entries> + </classPath> + <docPath> + <entries class="[Ljava.net.URL;"/> + </docPath> + <locked>false</locked> + <sourcePath> + <entries class="[Ljava.net.URL;"/> + </sourcePath> + </defaultLibraryDefinition> + <definitionList class="java.util.ArrayList"/> + <locked>false</locked> + <name>${lib.dependency.artifactId}</name> + </Item> + </j:forEach> + </libraryList> + </projectLibraryList> + <projectSettings> + <activeConfigName>Development</activeConfigName> + <commonData class="java.util.HashMap"> + <Item> + <Key>oracle.bm.commonIde.data.project.ModelerProjectSettings</Key> + <Value class="oracle.bm.commonIde.data.project.ModelerProjectSettings"> + <modelersPath> + <entries> + <Item path="model/"/> + </entries> + </modelersPath> + </Value> + </Item> + <Item> + <Key>oracle.jdeveloper.compiler.ant.AntConfiguration</Key> + <Value class="oracle.jdeveloper.compiler.ant.AntConfiguration"> + <arguments class="java.lang.String"/> + <makeTarget/> + <projectBuildfile/> + <rebuildTarget/> + <showOutput>true</showOutput> + </Value> + </Item> + </commonData> + <configurations class="java.util.TreeMap"> + <Item> + <Key>Development</Key> + <Value class="oracle.jdeveloper.model.JProjectConfiguration"> + <configData class="java.util.HashMap"> + <Item> + <Key>oracle.jdeveloper.compiler.OjcConfiguration</Key> + <Value class="oracle.jdeveloper.compiler.OjcConfiguration"> + <assertionsEnabled>false</assertionsEnabled> + <copyRes> <Item>.gif</Item> <Item>.properties</Item> <Item>.jpg</Item> <Item>.jpeg</Item> <Item>.xml</Item> <Item>-apf.xml</Item> - </copyRes> - <currentEncoding>Cp1252</currentEncoding> - <debugInformation>true</debugInformation> - <excludedClasses class="[Ljava.lang.String;"/> - <obfuscate>false</obfuscate> - <showCompileProgress>false</showCompileProgress> - <showDeprecations>true</showDeprecations> - <showObjectDotStaticWarnings>false</showObjectDotStaticWarnings> - <showPartialImportWarnings>false</showPartialImportWarnings> - <showSelfDeprecations>true</showSelfDeprecations> - <showUnusedImportWarnings>false</showUnusedImportWarnings> - <showWarnings>true</showWarnings> - <target>Default</target> - <updateImports>false</updateImports> - <updateZipJarImports>false</updateZipJarImports> - </Value> - </Item> - <Item> - <Key>oracle.jdeveloper.javadoc.JProjectJavadoc</Key> - <Value class="oracle.jdeveloper.javadoc.JProjectJavadoc"> - <generateAuthor>false</generateAuthor> - <generateDeprecated>true</generateDeprecated> - <generateIndex>true</generateIndex> - <generateNavbar>true</generateNavbar> - <generateSince>true</generateSince> - <generateTree>true</generateTree> - <generateVersion>false</generateVersion> - <heapSize>32</heapSize> - <miscOptions class="java.lang.String"/> - <oneOneFormat>false</oneOneFormat> - <outputDirectory path="target/docs/jdeveloper-javadoc/"/> - <scope>-protected</scope> - </Value> - </Item> - <Item> - <Key>oracle.jdeveloper.runner.RunConfiguration</Key> - <Value class="oracle.jdeveloper.runner.RunConfiguration"> + </copyRes> + <currentEncoding>Cp1252</currentEncoding> + <debugInformation>true</debugInformation> + <excludedClasses class="[Ljava.lang.String;"/> + <obfuscate>false</obfuscate> + <showCompileProgress>false</showCompileProgress> + <showDeprecations>true</showDeprecations> + <showObjectDotStaticWarnings>false</showObjectDotStaticWarnings> + <showPartialImportWarnings>false</showPartialImportWarnings> + <showSelfDeprecations>true</showSelfDeprecations> + <showUnusedImportWarnings>false</showUnusedImportWarnings> + <showWarnings>true</showWarnings> + <target>Default</target> + <updateImports>false</updateImports> + <updateZipJarImports>false</updateZipJarImports> + </Value> + </Item> + <Item> + <Key>oracle.jdeveloper.javadoc.JProjectJavadoc</Key> + <Value class="oracle.jdeveloper.javadoc.JProjectJavadoc"> + <generateAuthor>false</generateAuthor> + <generateDeprecated>true</generateDeprecated> + <generateIndex>true</generateIndex> + <generateNavbar>true</generateNavbar> + <generateSince>true</generateSince> + <generateTree>true</generateTree> + <generateVersion>false</generateVersion> + <heapSize>32</heapSize> + <miscOptions class="java.lang.String"/> + <oneOneFormat>false</oneOneFormat> + <outputDirectory path="target/docs/jdeveloper-javadoc/"/> + <scope>-protected</scope> + </Value> + </Item> + <Item> + <Key>oracle.jdeveloper.runner.RunConfiguration</Key> + <Value class="oracle.jdeveloper.runner.RunConfiguration"> <VMName>client</VMName> <allowInput>false</allowInput> <alwaysUseTarget>false</alwaysUseTarget> @@ -187,12 +187,12 @@ <runDirectoryURL/> <targetURL/> <useProxy>true</useProxy> - </Value> - </Item> + </Value> + </Item> - <Item> - <Key>oracle.jdevimpl.config.JProjectLibraries</Key> - <Value class="oracle.jdevimpl.config.JProjectLibraries"> + <Item> + <Key>oracle.jdevimpl.config.JProjectLibraries</Key> + <Value class="oracle.jdevimpl.config.JProjectLibraries"> <jdkName>j2sdk 1.4.1</jdkName> <jdkVersionNumber>1.4.1</jdkVersionNumber> <libraries> @@ -202,22 +202,22 @@ ${dep.artifactId}; </j:forEach> </j:set> - ${path} - </libraries> - </Value> - </Item> - <Item> - <Key>oracle.jdevimpl.config.JProjectPaths</Key> - <Value class="oracle.jdevimpl.config.JProjectPaths"> + ${path} + </libraries> + </Value> + </Item> + <Item> + <Key>oracle.jdevimpl.config.JProjectPaths</Key> + <Value class="oracle.jdevimpl.config.JProjectPaths"> <additionalClassPath> <entries class="[Ljava.net.URL;"/> </additionalClassPath> <outputDirectory path="target/jdeveloper-classes/"/> - </Value> - </Item> - <Item> - <Key>oracle.jdevimpl.idl.config.IdlConfiguration</Key> - <Value class="oracle.jdevimpl.idl.config.IdlConfiguration"> + </Value> + </Item> + <Item> + <Key>oracle.jdevimpl.idl.config.IdlConfiguration</Key> + <Value class="oracle.jdevimpl.idl.config.IdlConfiguration"> <codeForIncludedFiles>false</codeForIncludedFiles> <noBindMethods>false</noBindMethods> <noComments>false</noComments> @@ -228,20 +228,20 @@ <noToString>false</noToString> <objectWrapper>false</objectWrapper> <packageName class="java.lang.String"/> - </Value> - </Item> - <Item> - <Key>oracle.jdevimpl.runner.codecoach.CCConfiguration</Key> - <Value class="oracle.jdevimpl.runner.codecoach.CCConfiguration"> + </Value> + </Item> + <Item> + <Key>oracle.jdevimpl.runner.codecoach.CCConfiguration</Key> + <Value class="oracle.jdevimpl.runner.codecoach.CCConfiguration"> <advices>ALL</advices> <exclude>com;java;javax;sun;sunw;org;oracle</exclude> <include class="java.lang.String"/> <level>4</level> - </Value> - </Item> - <Item> - <Key>oracle.jdevimpl.runner.debug.DebugConfiguration</Key> - <Value class="oracle.jdevimpl.runner.debug.DebugConfiguration"> + </Value> + </Item> + <Item> + <Key>oracle.jdevimpl.runner.debug.DebugConfiguration</Key> + <Value class="oracle.jdevimpl.runner.debug.DebugConfiguration"> <JPDAClassicDebugArguments>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,address=<port></JPDAClassicDebugArguments> <JPDADebugArguments>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=<port></JPDADebugArguments> <OJVMDebugArguments>-XXdebug,quiet,port<port></OJVMDebugArguments> @@ -253,11 +253,11 @@ <startOption>running</startOption> <tracingDisabled>java;javax;sun;sunw;com.sun;org.xml.sax</tracingDisabled> <tracingEnabled class="java.lang.String"/> - </Value> - </Item> - <Item> - <Key>oracle.jdevimpl.runner.profile.ProfileConfiguration</Key> - <Value class="oracle.jdevimpl.runner.profile.ProfileConfiguration"> + </Value> + </Item> + <Item> + <Key>oracle.jdevimpl.runner.profile.ProfileConfiguration</Key> + <Value class="oracle.jdevimpl.runner.profile.ProfileConfiguration"> <DMSstartID>20000</DMSstartID> <DMSstate>0</DMSstate> <eventColumnVisible> @@ -302,11 +302,11 @@ <sampleInterval>5</sampleInterval> <sliderDepth>20</sliderDepth> <useAPI>false</useAPI> - </Value> - </Item> - <Item> - <Key>oracle.jdevimpl.sqlj.config.SqljConfiguration</Key> - <Value class="oracle.jdevimpl.sqlj.config.SqljConfiguration"> + </Value> + </Item> + <Item> + <Key>oracle.jdevimpl.sqlj.config.SqljConfiguration</Key> + <Value class="oracle.jdevimpl.sqlj.config.SqljConfiguration"> <checkSemantics>false</checkSemantics> <codegen>oracle</codegen> <contextConnectionMap class="java.util.HashMap"/> @@ -317,81 +317,80 @@ <warnPrecision>false</warnPrecision> <warnStrict>false</warnStrict> <warnVerbose>false</warnVerbose> - </Value> - </Item> - <Item> - <Key>WebappJspCompilerOptions</Key> - <Value class="oracle.jdevimpl.webapp.jsp.JspCompilerOptions"> + </Value> + </Item> + <Item> + <Key>WebappJspCompilerOptions</Key> + <Value class="oracle.jdevimpl.webapp.jsp.JspCompilerOptions"> <requestTimeIntrospection>false</requestTimeIntrospection> - </Value> - </Item> - </configData> - </Value> - </Item> - </configurations> - </projectSettings> - <projectSourcePath> - <entries> - <Item path="${pom.build.sourceDirectory}"/> - <Item path="${pom.build.unitTestDirectory}"/> - <Item path="${pom.build.integrationTestDirectory}"/> - <Item path="target/xdoclet/ejbdoclet"/> - <Item path="target/xdoclet/jmxdoclet"/> - </entries> - </projectSourcePath> - <properties class="java.util.HashMap"> - <Item> - <Key>useDynamicPaths</Key> - <Value class="java.lang.Boolean">true</Value> - </Item> - </properties> - <properties/> - <userAuthor/> - <userCompany>${pom.organization.name}</userCompany> - <userCopyright>${pom.organization.name}</userCopyright> - <userDescription/> - <userTitle/> - <userVersion/> -</project> - -</j:file> -</goal> + </Value> + </Item> + </configData> + </Value> + </Item> + </configurations> + </projectSettings> + <projectSourcePath> + <entries> + <Item path="${pom.build.sourceDirectory}"/> + <Item path="${pom.build.unitTestDirectory}"/> + <Item path="${pom.build.integrationTestDirectory}"/> + <Item path="target/xdoclet/ejbdoclet"/> + <Item path="target/xdoclet/jmxdoclet"/> + </entries> + </projectSourcePath> + <properties class="java.util.HashMap"> + <Item> + <Key>useDynamicPaths</Key> + <Value class="java.lang.Boolean">true</Value> + </Item> + </properties> + <properties/> + <userAuthor/> + <userCompany>${pom.organization.name}</userCompany> + <userCopyright>${pom.organization.name}</userCopyright> + <userDescription/> + <userTitle/> + <userVersion/> + </project> + </j:file> + </goal> <!-- Scans all source file in order to add them to the file. !--> <goal name="jdeveloper:scanSources" - description="Scans the source in order to integrate them into JDeveloper files" - > - <fileScanner var="javaSourceFiles"> - <fileset dir="${pom.build.sourceDirectory}"> - <patternset> - <include name="**/*.java"/> - </patternset> - </fileset> - </fileScanner> - <fileScanner var="unitTestSourceFiles"> - <fileset dir="${pom.build.unitTestDirectory}"> - <patternset> - <include name="**/*.java"/> - </patternset> - </fileset> - </fileScanner> - <fileScanner var="integrationTestSourceFiles"> - <fileset dir="${pom.build.integrationTestDirectory}"> - <patternset> - <include name="**/*.java"/> - </patternset> - </fileset> - </fileScanner> - <fileScanner var="javaDocFiles"> - <fileset dir="${pom.build.sourceDirectory}"> - <patternset> - <include name="**/*.html"/> - </patternset> - </fileset> - </fileScanner> + description="Scans the source in order to integrate them into JDeveloper files"> + + <ant:fileScanner var="javaSourceFiles"> + <ant:fileset dir="${pom.build.sourceDirectory}"> + <ant:patternset> + <ant:include name="**/*.java"/> + </ant:patternset> + </ant:fileset> + </ant:fileScanner> + <ant:fileScanner var="unitTestSourceFiles"> + <ant:fileset dir="${pom.build.unitTestDirectory}"> + <ant:patternset> + <ant:include name="**/*.java"/> + </ant:patternset> + </ant:fileset> + </ant:fileScanner> + <ant:fileScanner var="integrationTestSourceFiles"> + <ant:fileset dir="${pom.build.integrationTestDirectory}"> + <ant:patternset> + <ant:include name="**/*.java"/> + </ant:patternset> + </ant:fileset> + </ant:fileScanner> + <ant:fileScanner var="javaDocFiles"> + <ant:fileset dir="${pom.build.sourceDirectory}"> + <ant:patternset> + <ant:include name="**/*.html"/> + </ant:patternset> + </ant:fileset> + </ant:fileScanner> </goal>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]