henning 2004/10/31 08:11:37
Modified: extensions/maven-plugin/src/plugin-resources/flavor/common/conf
TurbineResources.properties application-intake.xml
application-web.xml application.properties
log4j.properties
extensions/maven-plugin/src/plugin-resources/flavor/common/maven
build.properties maven.xml project.properties
extensions/maven-plugin/src/plugin-resources/flavor/common/templates/macros
applicationMacros.vm
extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/maven
project.xml
extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/maven
project.xml
extensions/maven-plugin/src/plugin-resources/mode
inplace.properties normal.properties
extensions/maven-plugin/src/plugin-resources/om-layer/none/conf
componentConfiguration.xml roleConfiguration.xml
turbine-om.properties
extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf
componentConfiguration.xml roleConfiguration.xml
torque.properties turbine-om.properties
extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema
application-data.xml application-schema.xml
id-table-schema.xml turbine-security-data.xml
turbine-security-schema.xml
extensions/maven-plugin/src/plugin-resources/setup
setup.properties
Log:
- All XML Files use UTF-8 encoding
- make webapp pathes relative (no leading /)
- remove Apache copyright from template files; while the files themselves
are under ASF copyright, the resulting files in the web applications
should not, because even non-ASF copyrighted applications can be generated
by this plugin.
Revision Changes Path
1.3 +4 -20
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/TurbineResources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineResources.properties 10 Aug 2004 13:10:09 -0000 1.2
+++ TurbineResources.properties 31 Oct 2004 16:11:36 -0000 1.3
@@ -8,29 +8,13 @@
#
# -------------------------------------------------------------------
-#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
# -------------------------------------------------------------------
#
# L O G 4 J - L O G G I N G
#
# -------------------------------------------------------------------
-log4j.file = /WEB-INF/conf/log4j.properties
+log4j.file = WEB-INF/conf/log4j.properties
# -------------------------------------------------------------------
#
@@ -679,12 +663,12 @@
#
# Name and location to the configuration file for the components.
#
-services.AvalonComponentService.componentConfiguration =
/WEB-INF/conf/componentConfiguration.xml
+services.AvalonComponentService.componentConfiguration =
WEB-INF/conf/componentConfiguration.xml
#
# Name and location to the configuration file for the component roles.
#
-services.AvalonComponentService.componentRoles = /WEB-INF/conf/roleConfiguration.xml
+services.AvalonComponentService.componentRoles = WEB-INF/conf/roleConfiguration.xml
# -------------------------------------------------------------------
#
1.3 +2 -20
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application-intake.xml
Index: application-intake.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application-intake.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- application-intake.xml 10 Aug 2004 13:10:10 -0000 1.2
+++ application-intake.xml 31 Oct 2004 16:11:36 -0000 1.3
@@ -1,28 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
+<?xml version="1.0" encoding="UTF-8" ?>
<!-- ======================================================================== -->
<!-- -->
<!-- Default Intake file for Turbine Skeleton -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- ======================================================================== -->
1.3 +9 -20
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application-web.xml
Index: application-web.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application-web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- application-web.xml 10 Aug 2004 13:10:10 -0000 1.2
+++ application-web.xml 31 Oct 2004 16:11:36 -0000 1.3
@@ -1,28 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd";>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
-<!-- $Id$ -->
+<!-- ======================================================================== -->
+<!-- -->
+<!-- Web Application descriptor -->
+<!-- -->
+<!-- $Id$ -->
+<!-- -->
+<!-- ======================================================================== -->
<web-app>
<!-- ======================================================================== -->
@@ -41,7 +30,7 @@
<servlet-class>org.apache.turbine.Turbine</servlet-class>
<init-param>
<param-name>properties</param-name>
- <param-value>/WEB-INF/conf/TurbineResources.properties</param-value>
+ <param-value>WEB-INF/conf/TurbineResources.properties</param-value>
</init-param>
</servlet>
1.3 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application.properties
Index: application.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/application.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- application.properties 10 Aug 2004 13:10:10 -0000 1.2
+++ application.properties 31 Oct 2004 16:11:36 -0000 1.3
@@ -6,22 +6,6 @@
#
# -------------------------------------------------------------------
-#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
########################################################################
#
# Additional Packages for loading Modules
1.3 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/log4j.properties
Index: log4j.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/conf/log4j.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4j.properties 10 Aug 2004 13:10:10 -0000 1.2
+++ log4j.properties 31 Oct 2004 16:11:36 -0000 1.3
@@ -7,22 +7,6 @@
# ------------------------------------------------------------------------
#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
-#
# If we don't know the logging facility, put it into the
# turbine.log
#
1.3 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/build.properties
Index: build.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 10 Aug 2004 13:10:15 -0000 1.2
+++ build.properties 31 Oct 2004 16:11:36 -0000 1.3
@@ -6,22 +6,6 @@
# ------------------------------------------------------------------------
#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
-#
# Application Server configuration
#
maven.appserver.home = @MAVEN_APPSERVER_HOME@
1.3 +2 -22
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 10 Aug 2004 13:10:15 -0000 1.2
+++ maven.xml 31 Oct 2004 16:11:36 -0000 1.3
@@ -1,30 +1,10 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
+<?xml version="1.0" encoding="UTF-8" ?>
<!-- ======================================================================== -->
<!-- -->
<!-- maven Buildfile -->
<!-- -->
-<!-- Generated by the Turbine Plugin. -->
-<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- ======================================================================== -->
1.5 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/project.properties
Index: project.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/maven/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 27 Sep 2004 18:36:05 -0000 1.4
+++ project.properties 31 Oct 2004 16:11:36 -0000 1.5
@@ -7,22 +7,6 @@
# to do site or installation specific changes to the project build.
# -------------------------------------------------------------------
-#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
compile.debug = on
compile.optimize = off
compile.deprecation = off
1.3 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/templates/macros/applicationMacros.vm
Index: applicationMacros.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/common/templates/macros/applicationMacros.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- applicationMacros.vm 10 Aug 2004 13:10:15 -0000 1.2
+++ applicationMacros.vm 31 Oct 2004 16:11:36 -0000 1.3
@@ -1,20 +1,4 @@
##
-## Copyright 2001-2004 The Apache Software Foundation.
-##
-## Licensed 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.
-##
-
-##
## $Id$
##
## Default Macro file for @TURBINE_APP_NAME@
1.4 +2 -19
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/maven/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3/maven/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 27 Sep 2004 18:36:05 -0000 1.3
+++ project.xml 31 Oct 2004 16:11:37 -0000 1.4
@@ -1,27 +1,10 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
+<?xml version="1.0" encoding="UTF-8" ?>
<!-- =================================================================== -->
<!-- -->
<!-- Maven project.xml Datei -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- =================================================================== -->
1.6 +2 -20
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/maven/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/flavor/turbine-2.3.1/maven/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 31 Oct 2004 10:20:32 -0000 1.5
+++ project.xml 31 Oct 2004 16:11:37 -0000 1.6
@@ -1,28 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
+<?xml version="1.0" encoding="UTF-8" ?>
<!-- =================================================================== -->
<!-- -->
<!-- Maven project.xml Datei -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- =================================================================== -->
1.5 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties
Index: inplace.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/inplace.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- inplace.properties 27 Sep 2004 18:36:05 -0000 1.4
+++ inplace.properties 31 Oct 2004 16:11:37 -0000 1.5
@@ -7,22 +7,6 @@
# ------------------------------------------------------------------------
#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
-#
# Defaults for the plugin parameters. These are described in depth in
# the documentation. If you find any parameter in this file which is
# missing in the documentation, please report this to the Turbine
1.5 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/normal.properties
Index: normal.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/mode/normal.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- normal.properties 27 Sep 2004 18:36:05 -0000 1.4
+++ normal.properties 31 Oct 2004 16:11:37 -0000 1.5
@@ -7,22 +7,6 @@
# ------------------------------------------------------------------------
#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
-#
# Defaults for the plugin parameters. These are described in depth in
# the documentation. If you find any parameter in this file which is
# missing in the documentation, please report this to the Turbine
1.3 +2 -20
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/none/conf/componentConfiguration.xml
Index: componentConfiguration.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/none/conf/componentConfiguration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- componentConfiguration.xml 10 Aug 2004 13:10:18 -0000 1.2
+++ componentConfiguration.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,29 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!-- ======================================================================== -->
<!-- -->
<!-- Avalon component configuration -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- ======================================================================== -->
-
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
<componentConfig/>
1.3 +2 -20
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/none/conf/roleConfiguration.xml
Index: roleConfiguration.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/none/conf/roleConfiguration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- roleConfiguration.xml 10 Aug 2004 13:10:18 -0000 1.2
+++ roleConfiguration.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,30 +1,12 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!-- ======================================================================== -->
<!-- -->
<!-- Avalon role configuration -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- ======================================================================== -->
-
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
<role-list/>
1.3 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/none/conf/turbine-om.properties
Index: turbine-om.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/none/conf/turbine-om.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- turbine-om.properties 10 Aug 2004 13:10:18 -0000 1.2
+++ turbine-om.properties 31 Oct 2004 16:11:37 -0000 1.3
@@ -6,22 +6,6 @@
# -------------------------------------------------------------------
#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
-#
# This property must not be empty, so we use the default service. This
# will no access the Database unless explicitly forced to do so.
services.SecurityService.classname=org.apache.turbine.services.security.db.DBSecurityService
1.3 +3 -21
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf/componentConfiguration.xml
Index: componentConfiguration.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf/componentConfiguration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- componentConfiguration.xml 10 Aug 2004 13:10:22 -0000 1.2
+++ componentConfiguration.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,33 +1,15 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!-- ======================================================================== -->
<!-- -->
<!-- Avalon component configuration for loading Torque -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- ======================================================================== -->
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
-
<componentConfig>
<torque>
- <configfile>/WEB-INF/conf/torque.properties</configfile>
+ <configfile>WEB-INF/conf/torque.properties</configfile>
</torque>
</componentConfig>
1.3 +2 -20
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf/roleConfiguration.xml
Index: roleConfiguration.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf/roleConfiguration.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- roleConfiguration.xml 10 Aug 2004 13:10:22 -0000 1.2
+++ roleConfiguration.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,30 +1,12 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8" ?>
<!-- ======================================================================== -->
<!-- -->
<!-- Avalon role configuration for loading Torque -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- ======================================================================== -->
-
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
<role-list>
<role name="org.apache.torque.avalon.Torque"
1.3 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf/torque.properties
Index: torque.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf/torque.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.properties 10 Aug 2004 13:10:22 -0000 1.2
+++ torque.properties 31 Oct 2004 16:11:37 -0000 1.3
@@ -6,22 +6,6 @@
#
# ------------------------------------------------------------------------
-#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
torque.applicationRoot = .
# -------------------------------------------------------------------
1.3 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf/turbine-om.properties
Index: turbine-om.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/conf/turbine-om.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- turbine-om.properties 10 Aug 2004 13:10:22 -0000 1.2
+++ turbine-om.properties 31 Oct 2004 16:11:37 -0000 1.3
@@ -5,22 +5,6 @@
#
# -------------------------------------------------------------------
-#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
# Configure Torque Security Service
services.SecurityService.classname=org.apache.turbine.services.security.torque.TorqueSecurityService
1.3 +8 -18
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/application-data.xml
Index: application-data.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/application-data.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- application-data.xml 10 Aug 2004 13:10:22 -0000 1.2
+++ application-data.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,23 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<!DOCTYPE dataset SYSTEM "file://@[EMAIL PROTECTED]">
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
+<!--
=============================================================================== -->
+<!--
-->
+<!-- Application Data in XML. Add your custom values to this file
-->
+<!--
-->
+<!-- @version $Id$ -->
+<!--
-->
+<!--
=============================================================================== -->
<dataset name="all"/>
1.3 +8 -26
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/application-schema.xml
Index: application-schema.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/application-schema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- application-schema.xml 10 Aug 2004 13:10:22 -0000 1.2
+++ application-schema.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,31 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd";>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
-
-<!-- ======================================================================== -->
-<!-- = = -->
-<!-- = Database Definition for the Application = -->
-<!-- = = -->
-<!-- = @version $Id$ = -->
-<!-- = = -->
-<!-- ======================================================================== -->
+<!-- ==============================================================================
-->
+<!--
-->
+<!-- Database Definition for the Application
-->
+<!--
-->
+<!-- @version $Id$ -->
+<!--
-->
+<!-- ==============================================================================
-->
<database name="@DATABASE_DEFAULT@"
defaultIdMethod="idbroker"
1.3 +8 -26
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/id-table-schema.xml
Index: id-table-schema.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/id-table-schema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- id-table-schema.xml 10 Aug 2004 13:10:22 -0000 1.2
+++ id-table-schema.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,31 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd";>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
-
-<!-- ==================================================================== -->
-<!-- -->
-<!-- Table definition for the ID Broker Table used by Torque -->
-<!-- -->
+<!-- ========================================================================= -->
+<!-- -->
+<!-- Table definition for the ID Broker Table used by Torque -->
+<!-- -->
<!-- @version $Id$ -->
-<!-- -->
-<!-- ==================================================================== -->
+<!-- -->
+<!-- ========================================================================= -->
<database name="@DATABASE_DEFAULT@"
defaultIdMethod="idbroker"
1.3 +8 -26
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/turbine-security-data.xml
Index: turbine-security-data.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/turbine-security-data.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- turbine-security-data.xml 10 Aug 2004 13:10:22 -0000 1.2
+++ turbine-security-data.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,31 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<!DOCTYPE dataset SYSTEM "file://turbine-security-data.dtd">
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
-
-<!-- ==================================================================== -->
-<!-- -->
-<!-- Default Values for Admin and normal User -->
-<!-- -->
+<!--
=============================================================================== -->
+<!--
-->
+<!-- Default Values for Admin and normal User
-->
+<!--
-->
<!-- @version $Id$ -->
-<!-- -->
-<!-- ==================================================================== -->
+<!--
-->
+<!--
=============================================================================== -->
<dataset name="all">
1.3 +2 -20
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/turbine-security-schema.xml
Index: turbine-security-schema.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/om-layer/torque/schema/turbine-security-schema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- turbine-security-schema.xml 10 Aug 2004 13:10:23 -0000 1.2
+++ turbine-security-schema.xml 31 Oct 2004 16:11:37 -0000 1.3
@@ -1,29 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_1.dtd";>
-<!--
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed 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.
- */
- -->
-
<!-- ======================================================================== -->
<!-- -->
<!-- Turbine Torque based Security Service Schema -->
<!-- -->
-<!-- $Id$ -->
+<!-- $Id$ -->
<!-- -->
<!-- ======================================================================== -->
1.4 +1 -17
jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/setup/setup.properties
Index: setup.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/extensions/maven-plugin/src/plugin-resources/setup/setup.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- setup.properties 23 Aug 2004 00:27:14 -0000 1.3
+++ setup.properties 31 Oct 2004 16:11:37 -0000 1.4
@@ -7,22 +7,6 @@
# ------------------------------------------------------------------------
#
-# Copyright 2001-2004 The Apache Software Foundation.
-#
-# Licensed 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.
-#
-
-#
# These parameters have been set by turbine:setup. You can use this file
# to recreate the skeleton for the current application.
#
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
