Skip to content

Commit faa5014

Browse files
author
Howard Lewis Ship
committed
Set version numbers to 5.0.6-SNAPSHOT.
Reorganize the project, with a top level project replacing the old tapestry-project (containing the master POM), and with the modules in folder beneath it. Update the release notes. git-svn-id: https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk@552890 13f79535-47bb-0310-9956-ffa450edef68
1 parent d4765f0 commit faa5014

35 files changed

+129
-22
lines changed

‎.classpath

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="tapestry-core/src/test/java"/>
4+
<classpathentry kind="src" path="tapestry-tutorial1/src/test/java"/>
5+
<classpathentry kind="src" path="tapestry-hibernate/src/main/java"/>
6+
<classpathentry kind="src" path="tapestry-hibernate/src/test/java"/>
7+
<classpathentry kind="src" path="tapestry-core/src/main/java"/>
8+
<classpathentry kind="src" path="tapestry-test/src/main/java"/>
9+
<classpathentry kind="src" path="tapestry-component-report/src/main/java"/>
10+
<classpathentry kind="src" path="tapestry-ioc/src/test/java"/>
11+
<classpathentry kind="src" path="tapestry-upload/src/main/java"/>
12+
<classpathentry kind="src" path="tapestry-spring/src/main/java"/>
13+
<classpathentry kind="src" path="tapestry-ioc/src/main/java"/>
14+
<classpathentry kind="src" path="tapestry-spring/src/test/java"/>
15+
<classpathentry kind="src" path="tapestry-tutorial1/src/main/java"/>
16+
<classpathentry kind="src" path="tapestry-upload/src/test/java"/>
17+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
18+
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
19+
<classpathentry kind="lib" path="tapestry-core/src/main/resources"/>
20+
<classpathentry kind="lib" path="tapestry-core/src/test/resources"/>
21+
<classpathentry kind="lib" path="tapestry-hibernate/src/main/resources"/>
22+
<classpathentry kind="lib" path="tapestry-hibernate/src/test/resources"/>
23+
<classpathentry kind="lib" path="tapestry-ioc/src/main/resources"/>
24+
<classpathentry kind="lib" path="tapestry-ioc/src/test/resources"/>
25+
<classpathentry kind="lib" path="tapestry-spring/src/main/resources"/>
26+
<classpathentry kind="lib" path="tapestry-spring/src/test/resources"/>
27+
<classpathentry kind="lib" path="tapestry-test/src/main/resources"/>
28+
<classpathentry kind="lib" path="tapestry-tutorial1/src/main/resources"/>
29+
<classpathentry kind="lib" path="tapestry-tutorial1/src/test/resources"/>
30+
<classpathentry kind="lib" path="tapestry-upload/src/main/resources"/>
31+
<classpathentry kind="output" path="bin"/>
32+
</classpath>

‎.project

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>tapestry-project</name>
4+
<comment>Root Tapestry 5 Project containing all other modules</comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.maven.ide.eclipse.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.maven.ide.eclipse.maven2Nature</nature>
22+
</natures>
23+
</projectDescription>

‎tapestry-project/LICENSE-2.0.txt renamed to ‎LICENSE-2.0.txt

File renamed without changes.

‎tapestry-project/NOTICE.txt renamed to ‎NOTICE.txt

File renamed without changes.

‎tapestry-project/build.xml renamed to ‎build.xml

File renamed without changes.

‎tapestry-project/pom.xml renamed to ‎pom.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,24 @@
7474
</mailingLists>
7575

7676
<modules>
77-
<module>../tapestry-test</module>
78-
<module>../tapestry-ioc</module>
79-
<module>../tapestry-core</module>
80-
<module>../tapestry-spring</module>
81-
<module>../tapestry-hibernate</module>
82-
<module>../tapestry-upload</module>
77+
<module>tapestry-test</module>
78+
<module>tapestry-ioc</module>
79+
<module>tapestry-core</module>
80+
<module>tapestry-spring</module>
81+
<module>tapestry-hibernate</module>
82+
<module>tapestry-upload</module>
8383

8484
<!-- Temporarily removed until the project is named correctly and set up with a trunk, etc.
85-
<module>../tapestry-Workbench</module>
85+
<module>tapestry-Workbench</module>
8686
-->
8787
<!-- Now we're getting into the archetypes. -->
88-
<module>../quickstart</module>
88+
<module>quickstart</module>
8989
<!-- And the Maven plugin. -->
90-
<module>../tapestry-component-report</module>
90+
<module>tapestry-component-report</module>
9191

9292
<!-- Tutorials -->
9393

94-
<module>../tapestry-tutorial1</module>
94+
<module>tapestry-tutorial1</module>
9595

9696
</modules>
9797
<dependencyManagement>

‎tapestry-project/src/architecture.graffle renamed to ‎src/architecture.graffle

File renamed without changes.

‎tapestry-project/src/pagestructure.graffle renamed to ‎src/pagestructure.graffle

File renamed without changes.

‎tapestry-project/src/site/apt/dev/checklist.apt renamed to ‎src/site/apt/dev/checklist.apt

+25-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,29 @@ Vote will run for three days; on success I'll move the voted artifacts into plac
184184

185185
On success: roll it out!
186186

187-
<To be written up>
187+
You need to ssh to people.apache.org.
188+
189+
----
190+
> cd ~hlship/public_html/tapestry-releases/
191+
> chmod 664 *
192+
> mv * /www/www.apache.org/dist/tapestry/
193+
> rm /www/www.apache.org/dist/tapestry/*-5.0.4*
194+
----
195+
196+
Adjust the last line to remove the previous release. Only the current release should be in the dist folder.
197+
198+
The Maven artifacts are a little trickier, since there's the whole Maven folder hiearchy to deal with.
199+
200+
----
201+
> cd ~hlship/public_html/tapestry-ibiblio-rsynch-repository/
202+
> tar cf - * | ( cd /www/people.apache.org/repo/m2-ibiblio-rsync-repository && tar xvf - )
203+
----
204+
205+
This is an old hack for merging one directory into another.
206+
207+
The aritfacts copied to m2-ibiblio-rsync-repository will (eventually) by copied to the central Maven ibiblio repository, where they will be
208+
visible to every Maven user.
209+
188210

189211
Wait 24 Hours
190212

@@ -198,6 +220,8 @@ Update the Downloads Page
198220
to the old version number.
199221

200222
After making the changes, and checking it in to Subversion, you can build and deploy the site.
223+
224+
After deployment, it takes up to an hour for the changes to be visible.
201225

202226
Advance the Version Numbers
203227

‎tapestry-project/src/site/apt/dev/env.apt renamed to ‎src/site/apt/dev/env.apt

File renamed without changes.

‎tapestry-project/src/site/apt/index.apt renamed to ‎src/site/apt/index.apt

File renamed without changes.

‎tapestry-project/src/site/apt/jboss.apt renamed to ‎src/site/apt/jboss.apt

File renamed without changes.

‎tapestry-project/src/site/apt/jetty.apt renamed to ‎src/site/apt/jetty.apt

File renamed without changes.

‎tapestry-project/src/site/apt/screencast.apt renamed to ‎src/site/apt/screencast.apt

File renamed without changes.

‎tapestry-project/src/site/apt/struts.apt renamed to ‎src/site/apt/struts.apt

File renamed without changes.

‎tapestry-project/src/site/apt/tomcat.apt renamed to ‎src/site/apt/tomcat.apt

File renamed without changes.

‎tapestry-project/src/site/resources/images/asf_logo_wide.gif renamed to ‎src/site/resources/images/asf_logo_wide.gif

File renamed without changes.

‎tapestry-project/src/site/resources/screencast_3.html renamed to ‎src/site/resources/screencast_3.html

File renamed without changes.

‎tapestry-project/src/site/resources/screencast_4.html renamed to ‎src/site/resources/screencast_4.html

File renamed without changes.

‎tapestry-project/src/site/resources/screencast_5.html renamed to ‎src/site/resources/screencast_5.html

File renamed without changes.

‎tapestry-project/src/site/resources/t5-tutorial.pdf renamed to ‎src/site/resources/t5-tutorial.pdf

File renamed without changes.

‎tapestry-project/src/site/resources/tap5devwiki.html renamed to ‎src/site/resources/tap5devwiki.html

File renamed without changes.

‎tapestry-project/src/site/resources/tap5devwiki.xml renamed to ‎src/site/resources/tap5devwiki.xml

File renamed without changes.

‎tapestry-project/src/site/site.xml renamed to ‎src/site/site.xml

File renamed without changes.

‎tapestry-project/src/site/xdoc/release-notes.xml renamed to ‎src/site/xdoc/release-notes.xml

File renamed without changes.

‎tapestry-project/src/tapestry-favicon.graffle renamed to ‎src/tapestry-favicon.graffle

File renamed without changes.

‎tapestry-project/support/copyright-java.txt renamed to ‎support/copyright-java.txt

File renamed without changes.

‎tapestry-project/support/copyright-properties.txt renamed to ‎support/copyright-properties.txt

File renamed without changes.

‎tapestry-project/support/copyright-xml.txt renamed to ‎support/copyright-xml.txt

File renamed without changes.

‎tapestry-project/support/new-project.rb renamed to ‎support/new-project.rb

File renamed without changes.

‎tapestry-project/support/sign-and-upload.rb renamed to ‎support/sign-and-upload.rb

File renamed without changes.

‎support/tapestry-core.launch

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<launchConfiguration type="org.testng.eclipse.launchconfig">
3+
<intAttribute key="org.testng.eclipse.TYPE" value="3"/>
4+
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.testng.remote.RemoteTestNG"/>
5+
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx600m"/>
6+
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
7+
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
8+
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
9+
</listAttribute>
10+
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:tapestry5/tapestry-core}"/>
11+
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
12+
<stringAttribute key="org.testng.eclipse.COMPLIANCE_LEVEL" value="JDK"/>
13+
<listAttribute key="org.testng.eclipse.GROUP_LIST_CLASS"/>
14+
<listAttribute key="org.testng.eclipse.GROUP_LIST"/>
15+
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tapestry5"/>
16+
<mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS"/>
17+
<listAttribute key="org.testng.eclipse.SUITE_TEST_LIST">
18+
<listEntry value="tapestry-core/src/test/conf/testng.xml"/>
19+
</listAttribute>
20+
<stringAttribute key="org.testng.eclipse.LOG_LEVEL" value="2"/>
21+
</launchConfiguration>

‎support/tapestry-ioc.launch

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<launchConfiguration type="org.testng.eclipse.launchconfig">
3+
<listAttribute key="org.testng.eclipse.GROUP_LIST_CLASS"/>
4+
<listAttribute key="org.testng.eclipse.GROUP_LIST"/>
5+
<intAttribute key="org.testng.eclipse.TYPE" value="3"/>
6+
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.testng.remote.RemoteTestNG"/>
7+
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tapestry5"/>
8+
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
9+
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
10+
</listAttribute>
11+
<mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS"/>
12+
<listAttribute key="org.testng.eclipse.SUITE_TEST_LIST">
13+
<listEntry value="tapestry-ioc/src/test/conf/testng.xml"/>
14+
</listAttribute>
15+
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
16+
<stringAttribute key="org.testng.eclipse.LOG_LEVEL" value="2"/>
17+
<stringAttribute key="org.testng.eclipse.COMPLIANCE_LEVEL" value="JDK"/>
18+
</launchConfiguration>

‎tapestry-project/support/update-copyrights.rb renamed to ‎support/update-copyrights.rb

File renamed without changes.

‎tapestry-project/.project

-11
This file was deleted.

0 commit comments

Comments
 (0)