You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/09/19 02:04:02 UTC
svn commit: r816819 - in /geronimo/external/trunk/tomcat-archetype:
README.txt build-archetype.sh fixup.sh mv-resource.sh mydos2unix.sh
rm-archetype-goo.sh run.sh svn-actions.sh
Author: djencks
Date: Sat Sep 19 00:04:01 2009
New Revision: 816819
URL: http://svn.apache.org/viewvc?rev=816819&view=rev
Log:
add licenses to scripts, add a script to remove the scripts
Added:
geronimo/external/trunk/tomcat-archetype/rm-archetype-goo.sh (with props)
Modified:
geronimo/external/trunk/tomcat-archetype/README.txt
geronimo/external/trunk/tomcat-archetype/build-archetype.sh
geronimo/external/trunk/tomcat-archetype/fixup.sh
geronimo/external/trunk/tomcat-archetype/mv-resource.sh
geronimo/external/trunk/tomcat-archetype/mydos2unix.sh
geronimo/external/trunk/tomcat-archetype/run.sh
geronimo/external/trunk/tomcat-archetype/svn-actions.sh
Modified: geronimo/external/trunk/tomcat-archetype/README.txt
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/README.txt?rev=816819&r1=816818&r2=816819&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/README.txt (original)
+++ geronimo/external/trunk/tomcat-archetype/README.txt Sat Sep 19 00:04:01 2009
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
Use tomcat-archetype to build a new level of Tomcat
1. Update run.sh with the new Tomcat version number:
@@ -11,4 +27,7 @@
cd geronimo/external/trunk
./parent-archetype/run.sh
-3. Apply patches to tomcat-parent-6.0.20/
+3. Run ./rm-archetype-goo.sh after you've run all the other scripts and are happy with the results.
+ This removes the archetype scripts that aren't needed in the maven project.
+
+4. Apply patches to tomcat-parent-6.0.20/
Modified: geronimo/external/trunk/tomcat-archetype/build-archetype.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/build-archetype.sh?rev=816819&r1=816818&r2=816819&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/build-archetype.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/build-archetype.sh Sat Sep 19 00:04:01 2009
@@ -1,4 +1,20 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# build the archetype
mvn clean archetype:create-from-project
Modified: geronimo/external/trunk/tomcat-archetype/fixup.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/fixup.sh?rev=816819&r1=816818&r2=816819&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/fixup.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/fixup.sh Sat Sep 19 00:04:01 2009
@@ -1,4 +1,20 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
chmod u+x mydos2unix.sh
Modified: geronimo/external/trunk/tomcat-archetype/mv-resource.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/mv-resource.sh?rev=816819&r1=816818&r2=816819&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/mv-resource.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/mv-resource.sh Sat Sep 19 00:04:01 2009
@@ -1,4 +1,20 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# script to svn mv properties files from src/main/java to src/main/resources
Modified: geronimo/external/trunk/tomcat-archetype/mydos2unix.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/mydos2unix.sh?rev=816819&r1=816818&r2=816819&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/mydos2unix.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/mydos2unix.sh Sat Sep 19 00:04:01 2009
@@ -1,4 +1,20 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
echo processing $1
tr -d \\r <$1 > $1bak
Added: geronimo/external/trunk/tomcat-archetype/rm-archetype-goo.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/rm-archetype-goo.sh?rev=816819&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/rm-archetype-goo.sh (added)
+++ geronimo/external/trunk/tomcat-archetype/rm-archetype-goo.sh Sat Sep 19 00:04:01 2009
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# run after you have got all the other steps to work, to remove the scripts that did the work.
+# please don't run this in the archetype project itself
+
+svn rm build-archetype.sh fixup.sh mv-resource.sh mydos2unix.sh README.txt run.sh svn-actions.sh rm-archetype-goo.sh
\ No newline at end of file
Propchange: geronimo/external/trunk/tomcat-archetype/rm-archetype-goo.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-archetype/rm-archetype-goo.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/external/trunk/tomcat-archetype/rm-archetype-goo.sh
------------------------------------------------------------------------------
svn:keywords = Date Revision
Modified: geronimo/external/trunk/tomcat-archetype/run.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/run.sh?rev=816819&r1=816818&r2=816819&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/run.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/run.sh Sat Sep 19 00:04:01 2009
@@ -1,4 +1,20 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# Included as an example of how to set up a project. Works in *nix environments
# Update TVER and TTAGVER with the Tomcat version number in appropriate format
Modified: geronimo/external/trunk/tomcat-archetype/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/svn-actions.sh?rev=816819&r1=816818&r2=816819&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/svn-actions.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/svn-actions.sh Sat Sep 19 00:04:01 2009
@@ -1,4 +1,20 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
# Script to copy the tomcat source to the appropriate places in the mavenized project
# Run after running the tomcat archetype.