tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkuhn...@apache.org
Subject svn commit: r418492 - in /tapestry/tapestry4/trunk: .settings/org.eclipse.jdt.ui.prefs forrest.properties framework/pom.xml framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java pom.xml project.properties
Date Sat, 01 Jul 2006 17:28:25 GMT
Author: jkuhnert
Date: Sat Jul  1 10:28:24 2006
New Revision: 418492

URL: http://svn.apache.org/viewvc?rev=418492&view=rev
Log:
Cleaned up some files, fixed another unit test, added source jar distributions

Removed:
    tapestry/tapestry4/trunk/forrest.properties
    tapestry/tapestry4/trunk/project.properties
Modified:
    tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.ui.prefs
    tapestry/tapestry4/trunk/framework/pom.xml
    tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
    tapestry/tapestry4/trunk/pom.xml

Modified: tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.ui.prefs?rev=418492&r1=418491&r2=418492&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.ui.prefs (original)
+++ tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.ui.prefs Sat Jul  1 10:28:24 2006
@@ -1,4 +1,4 @@
-#Sat Mar 11 20:18:44 EST 2006
+#Sat Jul 01 12:53:42 EDT 2006
 eclipse.preferences.version=1
 formatter_profile=_tapestry
 formatter_settings_version=10
@@ -12,4 +12,4 @@
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.overrideannotation=true
 org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template
autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment
for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template
autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment
for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template
autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment
for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false"
context\="filecomment_context" deleted
 \="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment"
name\="filecomment">// Copyright ${date} The Apache Software Foundation\n//\n// Licensed
under the Apache License, Version 2.0 (the "License");\n// you may not use this file except
in compliance with the License.\n// You may obtain a copy of the License at\n//\n//     http\://www.apache.org/licenses/LICENSE-2.0\n//\n//
Unless required by applicable law or agreed to in writing, software\n// distributed under
the License is distributed on an "AS IS" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied.\n// See the License for the specific language governing permissions
and\n// limitations under the License.</template><template autoinsert\="true" context\="typecomment_context"
deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
name\="typecomment
 ">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true"
context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n
*/</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false"
description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false"
context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods"
enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**
\n * {@inheritDoc}\n */</template><template autoinsert\="true" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype"
name
 \="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new
class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template
autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in
new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody"
name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context"
deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody"
name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context"
deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody"
name\="an
 notationbody">\n</template><template autoinsert\="true" context\="catchblock_context"
deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock"
name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template
autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created
method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">//
${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true"
context\="constructorbody_context" deleted\="false" description\="Code in created constructor
stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n//
${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context"
deleted\="false" description\="Co
 de in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody"
name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context"
deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template
autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment
for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template
autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment
for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template
autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment
for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false"
context\="filecomment
 _context" deleted\="false" description\="Comment for created Java files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">// Copyright
${date} The Apache Software Foundation\n//\n// Licensed under the Apache License, Version
2.0 (the "License");\n// you may not use this file except in compliance with the License.\n//
You may obtain a copy of the License at\n//\n//     http\://www.apache.org/licenses/LICENSE-2.0\n//\n//
Unless required by applicable law or agreed to in writing, software\n// distributed under
the License is distributed on an "AS IS" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied.\n// See the License for the specific language governing permissions
and\n// limitations under the License.</template><template autoinsert\="true" context\="typecomment_context"
deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
n
 ame\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template
autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment
for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n
* \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false"
description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false"
context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods"
enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**
\n * {@inheritDoc}\n */</template><template autoinsert\="true" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetempla
 tes.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new
class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template
autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in
new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody"
name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context"
deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody"
name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context"
deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotati
 onbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context"
deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock"
name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template
autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created
method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">//
${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true"
context\="constructorbody_context" deleted\="false" description\="Code in created constructor
stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n//
${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context"
deleted\="false"
  description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody"
name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context"
deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template><template autoinsert\="true"
context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods"
enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n
* ${tags}\n * ${see_to_target}\n */</template></templates>

Modified: tapestry/tapestry4/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/pom.xml?rev=418492&r1=418491&r2=418492&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/framework/pom.xml Sat Jul  1 10:28:24 2006
@@ -173,18 +173,22 @@
                 <configuration>
                     <source>1.5</source>
                     <target>1.5</target>
-                    <fork>true</fork>
-                    <verbose>true</verbose>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.1-SNAPSHOT</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clover-plugin</artifactId>
                 <version>2.1</version>
                 <configuration>
                     <licenseLocation>
                         ${user.home}/.m2/repository/com/cenqua/clover/clover.license
                     </licenseLocation>
+                    <jdk>1.5</jdk>
                 </configuration>
                 <executions>
                     <execution>
@@ -256,6 +260,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.2-SNAPSHOT</version>
                 <configuration>
                     <configLocation>${basedir}/../tapestry-checkstyle.xml</configLocation>
                 </configuration>

Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java?rev=418492&r1=418491&r2=418492&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
(original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
Sat Jul  1 10:28:24 2006
@@ -14,19 +14,24 @@
 
 package org.apache.tapestry.asset;
 
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 import org.apache.hivemind.impl.DefaultClassResolver;
-import org.apache.hivemind.test.HiveMindTestCase;
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.oro.text.regex.Pattern;
 import org.apache.oro.text.regex.PatternCompiler;
 import org.apache.oro.text.regex.PatternMatcher;
 import org.apache.oro.text.regex.Perl5Compiler;
 import org.apache.oro.text.regex.Perl5Matcher;
+import org.apache.tapestry.BaseComponentTestCase;
 import org.apache.tapestry.services.ServiceConstants;
 import org.testng.annotations.Test;
 
@@ -36,7 +41,7 @@
  * @author jkuhnert
  */
 @Test
-public class TestUnprotectedAsset extends HiveMindTestCase
+public class TestUnprotectedAsset extends BaseComponentTestCase
 {
 
     PatternCompiler compiler = new Perl5Compiler();

Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=418492&r1=418491&r2=418492&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Sat Jul  1 10:28:24 2006
@@ -197,6 +197,10 @@
                         <target>1.5</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>



Mime
View raw message