Author: hlship
Date: Sat Oct 27 16:00:01 2007
New Revision: 589235
URL: http://svn.apache.org/viewvc?rev=589235&view=rev
Log:
TAPESTRY-1862: Change Tapestry to be compatible with Eclipse/Maven Plugin 0.0.11
Added:
tapestry/tapestry5/trunk/quickstart/.classpath
tapestry/tapestry5/trunk/tapestry-annotations/.classpath
tapestry/tapestry5/trunk/tapestry-annotations/.project
Modified:
tapestry/tapestry5/trunk/.classpath
tapestry/tapestry5/trunk/.project
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/.classpath
tapestry/tapestry5/trunk/src/site/apt/dev/env.apt
tapestry/tapestry5/trunk/support/update-eclipse
tapestry/tapestry5/trunk/tapestry-component-report/.classpath
tapestry/tapestry5/trunk/tapestry-component-report/.project
tapestry/tapestry5/trunk/tapestry-core/.classpath
tapestry/tapestry5/trunk/tapestry-core/.project
tapestry/tapestry5/trunk/tapestry-hibernate/.classpath
tapestry/tapestry5/trunk/tapestry-hibernate/.project
tapestry/tapestry5/trunk/tapestry-ioc/.classpath
tapestry/tapestry5/trunk/tapestry-ioc/.project
tapestry/tapestry5/trunk/tapestry-spring/.classpath
tapestry/tapestry5/trunk/tapestry-spring/.project
tapestry/tapestry5/trunk/tapestry-test/.classpath
tapestry/tapestry5/trunk/tapestry-test/.project
tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath
tapestry/tapestry5/trunk/tapestry-tutorial1/.project
tapestry/tapestry5/trunk/tapestry-upload/.classpath
tapestry/tapestry5/trunk/tapestry-upload/.project
Modified: tapestry/tapestry5/trunk/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/.classpath (original)
+++ tapestry/tapestry5/trunk/.classpath Sat Oct 27 16:00:01 2007
@@ -4,31 +4,30 @@
<classpathentry kind="src" output="bin"
path="tapestry-component-report/src/main/java"/>
<classpathentry kind="src" output="bin" path="tapestry-core/src/main/java"/>
<classpathentry kind="src" output="bin-test"
path="tapestry-core/src/test/java"/>
- <classpathentry kind="src" output="bin"
path="tapestry-hibernate/src/main/java"/>
- <classpathentry kind="src" output="bin-test"
path="tapestry-hibernate/src/test/java"/>
- <classpathentry kind="src" output="bin" path="tapestry-ioc/src/main/java"/>
- <classpathentry kind="src" output="bin-test"
path="tapestry-ioc/src/test/java"/>
- <classpathentry kind="src" output="bin"
path="tapestry-spring/src/main/java"/>
- <classpathentry kind="src" output="bin-test"
path="tapestry-spring/src/test/java"/>
- <classpathentry kind="src" output="bin" path="tapestry-test/src/main/java"/>
- <classpathentry kind="src" output="bin"
path="tapestry-tutorial1/src/main/java"/>
- <classpathentry kind="src" output="bin-test"
path="tapestry-tutorial1/src/test/java"/>
- <classpathentry kind="src" output="bin"
path="tapestry-upload/src/main/java"/>
- <classpathentry kind="src" output="bin-test"
path="tapestry-upload/src/test/java"/>
- <classpathentry kind="lib" path="quickstart/src/main/resources"/>
<classpathentry kind="lib" path="tapestry-core/src/main/resources"/>
<classpathentry kind="lib" path="tapestry-core/src/test/resources"/>
+ <classpathentry kind="src" output="bin"
path="tapestry-hibernate/src/main/java"/>
+ <classpathentry kind="src" output="bin-test"
path="tapestry-hibernate/src/test/java"/>
<classpathentry kind="lib" path="tapestry-hibernate/src/main/resources"/>
<classpathentry kind="lib" path="tapestry-hibernate/src/test/resources"/>
+ <classpathentry kind="src" output="bin" path="tapestry-ioc/src/main/java"/>
+ <classpathentry kind="src" output="bin-test"
path="tapestry-ioc/src/test/java"/>
<classpathentry kind="lib" path="tapestry-ioc/src/main/resources"/>
<classpathentry kind="lib" path="tapestry-ioc/src/test/resources"/>
+ <classpathentry kind="src" output="bin"
path="tapestry-spring/src/main/java"/>
+ <classpathentry kind="src" output="bin-test"
path="tapestry-spring/src/test/java"/>
<classpathentry kind="lib" path="tapestry-spring/src/main/resources"/>
<classpathentry kind="lib" path="tapestry-spring/src/test/resources"/>
+ <classpathentry kind="src" output="bin" path="tapestry-test/src/main/java"/>
<classpathentry kind="lib" path="tapestry-test/src/main/resources"/>
+ <classpathentry kind="src" output="bin"
path="tapestry-tutorial1/src/main/java"/>
+ <classpathentry kind="src" output="bin-test"
path="tapestry-tutorial1/src/test/java"/>
<classpathentry kind="lib" path="tapestry-tutorial1/src/main/resources"/>
<classpathentry kind="lib" path="tapestry-tutorial1/src/test/resources"/>
+ <classpathentry kind="src" output="bin"
path="tapestry-upload/src/main/java"/>
+ <classpathentry kind="src" output="bin-test"
path="tapestry-upload/src/test/java"/>
<classpathentry kind="lib" path="tapestry-upload/src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/.project (original)
+++ tapestry/tapestry5/trunk/.project Sat Oct 27 16:00:01 2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>tapestry-project</name>
- <comment>Root Tapestry 5 Project containing all other modules</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<projectDescription>
+ <name>datatech</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: tapestry/tapestry5/trunk/quickstart/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/.classpath?rev=589235&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/.classpath (added)
+++ tapestry/tapestry5/trunk/quickstart/.classpath Sat Oct 27 16:00:01 2007
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified:
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/.classpath
(original)
+++
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/.classpath
Sat Oct 27 16:00:01 2007
@@ -5,6 +5,6 @@
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="lib" path="src/test/resources"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/src/site/apt/dev/env.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/apt/dev/env.apt?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/apt/dev/env.apt (original)
+++ tapestry/tapestry5/trunk/src/site/apt/dev/env.apt Sat Oct 27 16:00:01 2007
@@ -8,14 +8,18 @@
Effectively, you should have the following tools:
- * Maven 2.0.6
+ * Maven 2.0.7
- * Eclipse 3.2.2
+ * Ant 1.7.0
- * Eclipse Maven Plugin (install from http://m2eclipse.codehaus.org/) version
0.0.9
+ * Eclipse 3.3.0
+
+ * Eclipse Maven Plugin (install from http://m2eclipse.codehaus.org/) version
0.0.11
+
+ * Version 0.0.11 is mandatory! Things will not work without it.
Builds
Tapestry 5 is built by Maven 2.
- You can build individual modules, or (from the tapestry-project folder)
build everything.
\ No newline at end of file
+ You can build individual modules, or (from the root folder) build everything.
\ No newline at end of file
Modified: tapestry/tapestry5/trunk/support/update-eclipse
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/support/update-eclipse?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/support/update-eclipse (original)
+++ tapestry/tapestry5/trunk/support/update-eclipse Sat Oct 27 16:00:01 2007
@@ -3,16 +3,12 @@
# This script is used to update the Eclipse .classpath file for the master
project; it is used when
# a module is added or removed, or when a src folder is added or removed from
a module.
#
-# It assumes the layout of each module conforms to Maven's default layout:
-# - src/main/java
-# - src/test/java
-# - test/main/resources
-# - src/test/resources
+# It assumes the layout of each module conforms to the normal Maven structure.
#
# This script must be executed from the root project directory (the directory
containing the master pom.xml, and containing
# the directories for the modules).
-# TODO: Update the .classpath in each module
+# TODO: Generated IDEA control files as well
require 'optparse'
@@ -25,6 +21,21 @@
require 'hpricot'
+CLASSPATH_HEADER = [
+ %Q{<?xml version="1.0" encoding="UTF-8"?>},
+ %Q{<classpath>}
+].freeze
+
+CLASSPATH_TRAILER = [
+ %Q{ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>},
+ %Q{ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>},
+ %Q{ <classpathentry kind="output" path="bin"/>},
+ %Q{</classpath>}
+].freeze
+
+# These may be overridden based on command line options
+
+$project_only = false
$dryrun = false
$opts = OptionParser.new do |opts|
@@ -34,6 +45,10 @@
$dryrun = true
end
+ opts.on("-p", "--project-only", "Update only the project control files,
not the individual modules") do
+ $project_only = true
+ end
+
opts.on("-h", "--help", "Help for this command") do
puts opts
exit
@@ -62,40 +77,98 @@
def add_source_folder(mod_name, folder, output_dir)
exist(mod_name, folder) do |path|
- $classpath << %Q{ <classpathentry kind="src" output="#{output_dir}"
path="#{path}"/>}
+ $project_classpath << %Q{ <classpathentry kind="src"
output="#{output_dir}" path="#{path}"/>}
+ $module_classpath << %Q{ <classpathentry kind="src"
output="#{output_dir}" path="#{folder}"/>}
end
end
def add_class_folder(mod_name, folder)
exist(mod_name, folder) do |path|
- $lib_classpath << %Q{ <classpathentry kind="lib" path="#{path}"/>}
+ $project_classpath << %Q{ <classpathentry kind="lib" path="#{path}"/>}
+ $module_classpath << %Q{ <classpathentry kind="lib" path="#{folder}"/> }
end
end
-def add_module(mod_name)
+def process_module(mod_name)
+
+ # quickstart, being an archetype, is the odd man out
+
+ return if mod_name == "quickstart"
+
+ $module_classpath = []
+
add_source_folder(mod_name, "src/main/java", "bin");
add_source_folder(mod_name, "src/test/java", "bin-test")
add_class_folder(mod_name, "src/main/resources")
add_class_folder(mod_name, "src/test/resources")
+
+ write_control_files(mod_name, mod_name, $module_classpath) unless
$project_only
+
end
-$master_pom = open("pom.xml") do |f|
- Hpricot.XML(f)
+def write_control_files(folder, project_name, classpath)
+
+ lines = CLASSPATH_HEADER.dup.concat(classpath).concat(CLASSPATH_TRAILER)
+
+ write_lines("#{folder}/.classpath", lines)
+
+ lines = [
+"<projectDescription>",
+" <name>#{project_name}</name>",
+" <comment></comment>",
+" <projects>",
+" </projects>",
+" <buildSpec>",
+" <buildCommand>",
+" <name>org.eclipse.jdt.core.javabuilder</name>",
+" <arguments>",
+" </arguments>",
+" </buildCommand>",
+" <buildCommand>",
+" <name>org.maven.ide.eclipse.maven2Builder</name>",
+" <arguments>",
+" </arguments>",
+" </buildCommand>",
+" </buildSpec>",
+" <natures>",
+" <nature>org.eclipse.jdt.core.javanature</nature>",
+" <nature>org.maven.ide.eclipse.maven2Nature</nature>",
+" </natures>",
+"</projectDescription>"
+]
+
+ write_lines("#{folder}/.project", lines)
+
end
+def write_lines(file, lines)
+ if $dryrun
+ puts "Generated #{file}:\n"
+ lines.each { |s| puts s }
+ puts
+ return
+ end
+
+ puts "Writing #{file} ..."
+
+ File.open(file, "w") do |file|
+ lines.each do |line|
+ file.print line
+ file.print "\n"
+ end
+ end
+
+end
-# We're going to build up the classpath a line at a time. This part is always
the same:
+$master_pom = open("pom.xml") do |f|
+ Hpricot.XML(f)
+end
-$classpath = [
- %Q{<?xml version="1.0" encoding="UTF-8"?>},
- "<classpath>"
-]
-# I like the resource folders to be organized at the bottom of the list, after
all source folders.
-# So we use a temporary buffer to collect those lines and add them all in at
the end.
+# We're going to build up the project classpath a line at a time. This part
is always the same:
-$lib_classpath = []
+$project_classpath = []
$modules = []
@@ -103,37 +176,11 @@
# Add entries for each module
-$modules.sort.each { |mod_name| add_module(mod_name) }
-
-# Add in the libraries (i.e. class folders)
-
-$classpath.concat($lib_classpath)
-
-# And this stuff is attached to the end.
-
-$classpath.concat [
- %Q{ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>},
- %Q{ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>},
- %Q{ <classpathentry kind="output" path="bin"/>},
- %Q{</classpath>}
- ]
-
-# And we're done!
-
-if $dryrun
- puts "Generated .classpath:"
- $classpath.each { |s| puts s }
- exit
-end
+$modules.sort.each { |mod_name| process_module(mod_name) }
# Write out the updated .classpath
-File.open(".classpath", "w") do |file|
- $classpath.each do |line|
- file.print line
- file.print "\n"
- end
-end
+write_control_files(".", "datatech", $project_classpath)
-puts "Updated .classpath successfully."
+puts "Updated .classpath across project."
Added: tapestry/tapestry5/trunk/tapestry-annotations/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/.classpath?rev=589235&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/.classpath (added)
+++ tapestry/tapestry5/trunk/tapestry-annotations/.classpath Sat Oct 27
16:00:01 2007
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: tapestry/tapestry5/trunk/tapestry-annotations/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-annotations/.project?rev=589235&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-annotations/.project (added)
+++ tapestry/tapestry5/trunk/tapestry-annotations/.project Sat Oct 27 16:00:01
2007
@@ -0,0 +1,22 @@
+<projectDescription>
+ <name>tapestry-annotations</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-component-report/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/.classpath Sat Oct 27
16:00:01 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-component-report/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/.project Sat Oct 27
16:00:01 2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>tapestry-component-report</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-component-report</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-core/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-core/.classpath Sat Oct 27 16:00:01 2007
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="lib" path="src/main/resources"/>
- <classpathentry kind="src" output="bin-test" path="src/test/java"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="lib" path="src/test/conf"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="lib" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-core/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-core/.project Sat Oct 27 16:00:01 2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>tapestry-core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
+<projectDescription>
+ <name>tapestry-core</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/.classpath Sat Oct 27 16:00:01
2007
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="lib" path="src/main/resources"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="lib" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/.project Sat Oct 27 16:00:01
2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>tapestry-hibernate</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-hibernate</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-ioc/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/.classpath Sat Oct 27 16:00:01 2007
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="bin-test" path="src/test/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="src/main/resources"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="lib" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-ioc/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/.project Sat Oct 27 16:00:01 2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>tapestry-ioc</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-ioc</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-spring/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/.classpath Sat Oct 27 16:00:01 2007
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" output="bin-test" path="src/test/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/main/resources"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="lib" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-spring/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/.project Sat Oct 27 16:00:01 2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>tapestry-spring</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-spring</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-test/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-test/.classpath Sat Oct 27 16:00:01 2007
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/main/resources"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-test/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-test/.project Sat Oct 27 16:00:01 2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>tapestry-test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/.classpath Sat Oct 27 16:00:01
2007
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="lib" path="src/main/resources"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="lib" path="src/test/resources"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="lib" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/.project Sat Oct 27 16:00:01
2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>tapestry-tutorial1</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-tutorial1</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
Modified: tapestry/tapestry5/trunk/tapestry-upload/.classpath
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/.classpath?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/.classpath (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/.classpath Sat Oct 27 16:00:01 2007
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="lib" path="src/main/resources"/>
- <classpathentry kind="lib" path="src/test/conf"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="src" output="bin" path="src/main/java"/>
+ <classpathentry kind="src" output="bin-test" path="src/test/java"/>
+ <classpathentry kind="lib" path="src/main/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/noworkspace"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/trunk/tapestry-upload/.project
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/.project?rev=589235&r1=589234&r2=589235&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/.project (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/.project Sat Oct 27 16:00:01 2007
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>tapestry-upload</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
+ <name>tapestry-upload</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
</projectDescription>
