diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly index babba097..7f7ccfb7 100644 --- a/jbuilder/plugin.jelly +++ b/jbuilder/plugin.jelly @@ -1,78 +1,480 @@ - - - + xmlns:u="jelly:util" + xmlns:def="jelly:define" + xmlns:m="jelly:maven" + xmlns:x="jelly:xml" + xmlns:jbuilder="jbuilder" > - - - + + + + + + + + + + + + + + + + + + + + ${jbuilderDirs} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Checking dependency ${libraryName} ... + + + + + + + + + + + + + + + unversioned library definition not found + + + + + + + + + + + + + + + + + + + + + + creating dependent ${libraryFile} + + + Creating dependent ${libraryFile} ... + + + + + + + + + JBuilder Library Definition File + ${libraryName} + + + + + + + + + + dependency + + + + + + + + + + + + referencing artifact library ${unversionedLibraryFile} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Creating ${libraryFile} ... + + + JBuilder Library Definition File + ${libraryName} + + + + + + + + + + + + + project + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +------------------------------------------------------------------ + | WARNING! + | + | A JBuilder installation could not be found. The project files + | being created will contain default values. + +------------------------------------------------------------------ + + + Reading default project ${jbDefaultProject} + + + + + + + + + + + + + +------------------------------------------------------------------ + | WARNING! + | + | This project is being configured to use ${jdk}. This + | JDK has not been configured yet in your JBuilder installation. + | Go to Tools|Configure JDKs. + +------------------------------------------------------------------ + + + + + Creating ${basedir}/${pom.artifactId}.jpx ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JBuilder XML Project + + + + + + + + + + + + + + + + + + + + + + + + + + ${maven.jbuilder.additionalSources} + + + + + + + + + ${maven.jbuilder.application.classes} + + + + + + + ${maven.jbuilder.applets.classes} + + + + + + + + + + + + + + + + + - Creating ${basedir}/${pom.artifactId}.library ... - - - - JBuilder Library Definition File - ${pom.artifactId} - - - - - - - - - - - - - - - - - - ${pom.artifactId} - - - - - - - - Creating ${basedir}/${pom.artifactId}.jpx ... - - Project XML JBuilder - - - - - - - - - - - - - - - - - - - - - - + + + + ++------------------------------------------------------------------ +| ERROR! +| +| A JBuilder installation could not be found. ++------------------------------------------------------------------ + + + + + + + diff --git a/jbuilder/plugin.properties b/jbuilder/plugin.properties index 8326a871..97038381 100644 --- a/jbuilder/plugin.properties +++ b/jbuilder/plugin.properties @@ -1,2 +1,30 @@ -maven.jbuilder.docpath=target/jbuilder-doc -maven.jbuilder.outpath=target/jbuilder-classes +# ------------------------------------------------------------------- +# Default JBuilder properties +# ------------------------------------------------------------------- +maven.jbuilder.userHome = ${user.home} +maven.jbuilder.outpath = ${maven.build.dest} +maven.jbuilder.application.runner = com.borland.jbuilder.runtime.ApplicationRunner +maven.jbuilder.applet.runner = com.borland.jbuilder.runtime.AppletRunner + +# List of additional files that should be added to the JBuilder project if +# they exist. The default is the standard Maven project files. +maven.jbuilder.additionalSources = project.xml,maven.xml,project.properties + +# Optional documentation path. If not defined, the path defined by the javadoc +# plugin will be used. +#maven.jbuilder.docpath = ${maven.build.dir}/jbuilder-doc + +# Optional list of test dependencies. The list must be an instance of +# java.util.List and each element of the list must be an instance of +# org.apache.maven.project.Dependency. Therefore, this variable technically +# cannot be initialized in a properties file, it must be initialized via jelly +# code. It is listed here for documentation purposes. In general, the test +# dependencies will be project specific and should be initialized in a pre-goal. +#maven.jbuilder.testDependencies = + +# Optional source paths for libraries that refer to versioned jars in the local +# repository. In general, these will be user specific and should go in +# $HOME/build.properties. +#maven.jbuilder.junit-3.8.1.librarySource = [C:/JUnit/src.jar] +#maven.jbuilder.ant-1.5.2.librarySource = C:/apache-ant-1.5.2/src/main +#maven.jbuilder.jnlp-1.2.librarySource = C:/jnlp/src diff --git a/jbuilder/project.xml b/jbuilder/project.xml index 84cd6976..7a3723f1 100644 --- a/jbuilder/project.xml +++ b/jbuilder/project.xml @@ -5,7 +5,7 @@ 3 maven-jbuilder-plugin Maven JBuilder Plug-in - 1.2 + 1.3-SNAPSHOT JBuilder Plugin for Maven http://maven.apache.org/reference/plugins/jbuilder/ @@ -34,6 +34,12 @@ + + + David Zeleznik + dzeleznik@ilog.com + + commons-jelly diff --git a/jbuilder/xdocs/changes.xml b/jbuilder/xdocs/changes.xml index 90f1917c..8a0df8e4 100644 --- a/jbuilder/xdocs/changes.xml +++ b/jbuilder/xdocs/changes.xml @@ -6,11 +6,47 @@ + + + The plugin attempts to find JBuilder's "HOME" directory where it will read the user's default project properties file. The JBuilder "HOME" directory is also where library files are generated. + + + When you generate a JBuilder project file, the plugin iterates through its dependencies. For each dependency, a library definition file is generated for the dependency jar in the local repo. This dependent library file is generated if, and only if, the library file does not already exist or the library file was previously generated the same way (as a dependency on a jar in the local repo). + + + The previous point means that when you generate a jbuilder library definition file directly from a Maven project (using the jbuilder:generate-library goal) you will replace any previous definition of the library that was generated as a jar-only dependency with a library definition that references both the source and class files. + + + For library definitions that remain jar-only references to the local repo, you can specify a path to the corresponding source code via properties. + + + Support has been added for generating JBuilder application and applet runtime configurations from properties. + + + Any resources are added to the JBuilder project source path. + + + Using an optional property, you can specify a list of explicit files that will be included in the JBuilder project if they exist. The default list are project.xml, project.properties, and maven.xml. + + + Added support for JBuilder 9 + + + Added maven.jbuilder.verbose property + + + Library files that are automatically generated from versioned (not snapshot) artifact dependencies are now versioned themselves. This is also true for snapshot dependencies where an unversioned library file has not been created yet from the corresponding artifact. As before, if an unversioned library file has already been created for a snapshot dependency, the unversioned library will be referenced. + + - Write company, description and title properties in jbuilder project.
- Added new maven.juilder-docpath plugin property.
- Added new maven.juilder-outpath plugin property.
+ Write company, description and title properties in jbuilder project. + + + Added new maven.juilder-docpath plugin property. + + + Added new maven.juilder-outpath plugin property. diff --git a/jbuilder/xdocs/properties.xml b/jbuilder/xdocs/properties.xml index dc4a33d0..4cff7295 100644 --- a/jbuilder/xdocs/properties.xml +++ b/jbuilder/xdocs/properties.xml @@ -15,12 +15,12 @@ Description - maven.juilder.docpath + maven.jbuilder.userHome Yes

- Location of documentation used by JBuilder. - Default : target/jbuilder-doc + the JBuilder user home directory. + Default : ${user.home}

@@ -30,7 +30,53 @@

Location of output directory used by JBuilder for classes. - Default : target/jbuilder-classes + Default : ${maven.build.dest} +

+ + + + maven.jbuilder.additionalSources + Yes + +

+ List of additional files that should be added to the JBuilder project if + they exist. The default is the standard Maven project files. All values are + separated by a comma. + Default : project.xml,maven.xml,project.properties +

+ + + + maven.jbuilder.docpath + Yes + +

+ Optional documentation path. If not defined, the path defined by the javadoc + plugin will be used. +

+ + + + maven.jbuilder.testDependencies + Yes + +

+ Optional list of test dependencies. The list must be an instance of + java.util.List and each element of the list must be an instance of + org.apache.maven.project.Dependency. Therefore, this variable technically + cannot be initialized in a properties file, it must be initialized via jelly + code. It is listed here for documentation purposes. In general, the test + dependencies will be project specific and should be initialized in a pre-goal. +

+ + + + maven.jbuilder.verbose + Yes + +

+ The verbose mode for generating the dependency library. + Default : false