You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2008/01/25 21:25:35 UTC
svn commit: r615328 [15/18] - in /turbine/core/trunk: ./ conf/ conf/test/
extensions/maven-plugin/ extensions/maven-plugin/conf/
extensions/maven-plugin/src/plugin-resources/demo/templates/layouts/
extensions/maven-plugin/src/plugin-resources/demo/temp...
Modified: turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/TestComponentImpl.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/BrowserDetectorTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/BrowserDetectorTest.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/BrowserDetectorTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/BrowserDetectorTest.java Fri Jan 25 12:25:05 2008
@@ -1,19 +1,22 @@
package org.apache.turbine.util;
/*
- * Copyright 2005 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.turbine.test.BaseTestCase;
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/FormMessageTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/FormMessageTest.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/FormMessageTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/FormMessageTest.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/parser/BaseValueParserTest.java Fri Jan 25 12:25:05 2008
@@ -2,19 +2,22 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
@@ -636,7 +639,7 @@
}
}
-
+
public void testRecycling() throws Exception {
parser.setCharacterEncoding("fake");
parser.recycle();
Modified: turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/util/uri/TurbineURITest.java Fri Jan 25 12:25:05 2008
@@ -1,19 +1,22 @@
package org.apache.turbine.util.uri;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
*/
import org.apache.commons.configuration.BaseConfiguration;
@@ -64,7 +67,7 @@
*/
protected void setUp()
{
- ServerData sd = new ServerData("www.testserver.com",
+ ServerData sd = new ServerData("www.testserver.com",
URIConstants.HTTP_PORT, URIConstants.HTTP,
"/servlet/turbine", "/context");
turi = new TurbineURI(sd);
@@ -107,7 +110,7 @@
turi.addQueryData("test", "");
assertEquals("/context/servlet/turbine?test=", turi.getRelativeLink());
turi.removeQueryData("test");
-
+
// Check null
assertEquals("/context/servlet/turbine", turi.getRelativeLink());
turi.addQueryData("test", null);
@@ -124,7 +127,7 @@
// Kind of susspect result - might result in "//" in the URL.
assertEquals("/context/servlet/turbine/test/", turi.getRelativeLink());
turi.removePathInfo("test");
-
+
// Check null
assertEquals("/context/servlet/turbine", turi.getRelativeLink());
turi.addPathInfo("test", null);
@@ -147,11 +150,11 @@
assertEquals("/context/servlet/turbine?test=", turi.getRelativeLink());
turi.removeQueryData("test");
assertEquals("/context/servlet/turbine", turi.getRelativeLink());
-
+
pp = new DefaultParameterParser();
pp.add("test", (String) null);
turi.add(1, pp); // 1 = query data
- // Should make the following work so as to be consistent with directly added values.
+ // Should make the following work so as to be consistent with directly added values.
//assertEquals("/context/servlet/turbine?test=null", turi.getRelativeLink());
turi.removeQueryData("test");
assertEquals("/context/servlet/turbine", turi.getRelativeLink());
@@ -159,7 +162,7 @@
// TRB-8
//
// This is commented out for now as it results in a ClassCastException.
- // The 2_3 branch parser changes need to be merged into the fulcrum code.
+ // The 2_3 branch parser changes need to be merged into the fulcrum code.
//
//pp = new DefaultParameterParser();
//DiskFileItemFactory factory = new DiskFileItemFactory(10240, null);
@@ -171,5 +174,5 @@
//turi.removeQueryData("upload-field");
//assertEquals("/context/servlet/turbine", turi.getRelativeLink());
}
-
+
}
Modified: turbine/core/trunk/src/tlds/template.tld
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/tlds/template.tld?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/src/tlds/template.tld (original)
+++ turbine/core/trunk/src/tlds/template.tld Fri Jan 25 12:25:05 2008
@@ -1,7 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
- "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!--
+ 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.
+-->
+<!DOCTYPE taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+ "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
<taglib>
<tlibversion>1.0</tlibversion>
<jspversion>1.1</jspversion>
@@ -11,7 +29,7 @@
<tagclass>org.apache.turbine.services.jsp.tags.HeadTag</tagclass>
<bodycontent>JSP</bodycontent>
</tag>
- <tag>
+ <tag>
<name>body</name>
<tagclass>org.apache.turbine.services.jsp.tags.BodyTag</tagclass>
<bodycontent>JSP</bodycontent>
@@ -21,7 +39,7 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
- <tag>
+ <tag>
<name>navigation</name>
<tagclass>org.apache.turbine.services.jsp.tags.NavigationTag</tagclass>
<bodycontent>JSP</bodycontent>
@@ -30,7 +48,7 @@
<required>true</required>
</attribute>
</tag>
- <tag>
+ <tag>
<name>screen</name>
<tagclass>org.apache.turbine.services.jsp.tags.ScreenTag</tagclass>
<bodycontent>JSP</bodycontent>
@@ -44,12 +62,12 @@
<rtexprvalue>false</rtexprvalue>
</attribute>
</tag>
- <tag>
+ <tag>
<name>bodyAttributes</name>
<tagclass>org.apache.turbine.services.jsp.tags.BodyAttributesTag</tagclass>
<bodycontent>JSP</bodycontent>
</tag>
- <tag>
+ <tag>
<name>wmVar</name>
<tagclass>org.apache.turbine.services.jsp.tags.WebMacroVariableTag</tagclass>
<bodycontent>JSP</bodycontent>
Modified: turbine/core/trunk/xdocs/changes-pre24.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/changes-pre24.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/changes-pre24.xml (original)
+++ turbine/core/trunk/xdocs/changes-pre24.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -56,12 +57,12 @@
<p>
<ul>
<li>
- The IntakeService has been refactored, introducing two Abstract classes; the
- DefaultValidator and the NumberValidator. They both contain rules which are
+ The IntakeService has been refactored, introducing two Abstract classes; the
+ DefaultValidator and the NumberValidator. They both contain rules which are
applicable to all Validator's and NumbeValidator's respectively. Unnecessary use
was being made of (Old) NumberValidator which used BigDecimals, cleaned this up
- implementing concrete classes for all Number Types. Simplified definition of
- (number & required) rules in Intake.xml.
+ implementing concrete classes for all Number Types. Simplified definition of
+ (number & required) rules in Intake.xml.
</li>
<li>
The LoginUser action no longer checks to see if the user object is already
@@ -109,21 +110,21 @@
The handling of "," as a separator in template names was tightened and
clarified. Many places where you could get away with using "/" as a separator
or use a leading "/" for a template name now no longer work. There is a long
- description on how to use and not to use this in the javadoc for
+ description on how to use and not to use this in the javadoc for
org.apache.turbine.services.template.TurbineTemplateService. If you want to volunteer
for work on Turbine, feel free to whip this into an xdoc and put it into the
documentation tree.
</li>
<li>
Some classes have been moved into different packages to allow cleanup and
- clarification of their usage. The old locations are still available but
+ clarification of their usage. The old locations are still available but
deprecated. Examples are the parser classes from org.apache.turbine.util to
org.apache.turbine.util.parser and some of the pull tools from org.apache.turbine.util.pull
to org.apache.turbine.services.pull.tools
</li>
<li>
getSizeMax() in the UploadService interface and implementations changed
- from int to long to reflect a change that was made in the underlying
+ from int to long to reflect a change that was made in the underlying
commons-fileupload component.
</li>
</ul>
@@ -144,7 +145,7 @@
Added a Howto describing using Hibernate with Turbine. The actual code is
currently not part of the Turbine distrib due to licensing issues, but is very
easy to implement due to Turbine support of Avalon Components.
- </li>
+ </li>
<li>
Changed TurbineUser so that when either perment or temporary values are
stored, if the required hashtable was missing, then it was created. This
@@ -249,7 +250,7 @@
Configuration values can be overridden. If you specify JNDI and the .xml, if a value
is found in JNDI, then it is used. Useful for overriding environment specific values
like mail servers or whether Velocity templates are reloadable.
- </li>
+ </li>
</ul>
</li>
<li>
@@ -383,7 +384,7 @@
The TurbineDB Service has been deprecated. Use Torque and the Component Service to start Torque.
</li>
<li>
- It is possible to debug pressure on the PoolService by setting services.PoolService.pool.debug to true
+ It is possible to debug pressure on the PoolService by setting services.PoolService.pool.debug to true
in the TurbineResources.properties.
</li>
<li>
@@ -396,22 +397,22 @@
based pages.
</li>
<li>
- The ComponentService (using the stratum lifecycle interfaces) is
- deprecated. It will be removed after the 2.3 release as the stratum
+ The ComponentService (using the stratum lifecycle interfaces) is
+ deprecated. It will be removed after the 2.3 release as the stratum
package is unmaintained. We use the new AvalonComponentService to
- initialize Torque.
+ initialize Torque.
</li>
<li>
- ActionEvent and VelocityActionEvent can "ignore" eventSubmit_<xxx> events if they
+ ActionEvent and VelocityActionEvent can "ignore" eventSubmit_<xxx> events if they
contain an empty or a zero value. This behaviour is controlled by the "action.eventsubmit.needsvalue"
property that defaults to "off", which means no change from the pre-2.3 behaviour. The new behaviour
- is useful if you have multiple event fields in a form and only one should be selected
+ is useful if you have multiple event fields in a form and only one should be selected
(e.g. by a client side java script application).
</li>
<li>
VelocityService now uses the EventCartridge Code to catch and log invocation errors from templates.
This is very useful when debugging pull tools, because you get the actual exception in the log and
- not only the velocity internal stack trace. You can switch this behaviour off by setting
+ not only the velocity internal stack trace. You can switch this behaviour off by setting
"services.VelocityService.catch.errors" to off or false.
</li>
<li>
Modified: turbine/core/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/changes.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/changes.xml (original)
+++ turbine/core/trunk/xdocs/changes.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
<!--
-/*
- * Copyright 2001-2006 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.
- */
- -->
+ 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.
+-->
<document>
<properties>
<title>Changes</title>
Modified: turbine/core/trunk/xdocs/features.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/features.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/features.xml (original)
+++ turbine/core/trunk/xdocs/features.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2001-2006 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -105,7 +106,7 @@
<li>
Properties can be stored in JNDI, XML, or .properties files! Properties can
override each other.
- </li>
+ </li>
<li>
Integration with JavaMail to make sending email painless</li>
<li>
Modified: turbine/core/trunk/xdocs/fsd.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/fsd.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/fsd.xml (original)
+++ turbine/core/trunk/xdocs/fsd.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
Modified: turbine/core/trunk/xdocs/getting-started.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/getting-started.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/getting-started.xml (original)
+++ turbine/core/trunk/xdocs/getting-started.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2001-2006 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
Modified: turbine/core/trunk/xdocs/how-to-build.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/how-to-build.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/how-to-build.xml (original)
+++ turbine/core/trunk/xdocs/how-to-build.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -40,7 +41,7 @@
</p>
<p>
- To build these three projects, from the Turbine home directory just run 'maven' and by
+ To build these three projects, from the Turbine home directory just run 'maven' and by
default each of these projects will be compiled, test cases run, and jar files created.
This will also install the artifacts into your local Maven repository as well.
</p>
@@ -54,7 +55,7 @@
<section name="Extension Details">
-
+
<subsection name="Maven Plugin for Turbine">
<p>
You can then go into your local repostory and take the jar file called <code>maven-turbine-plugin-XX.jar</code>
@@ -66,7 +67,7 @@
<subsection name="Torque Impl">
<p>
The Torque implementations for the Schedule and Security services where broken out into seperate Maven
- projects in the Extensions directory because they require a codegeneration step before compiling the
+ projects in the Extensions directory because they require a codegeneration step before compiling the
source code. Additioanlly, these services should implement an API defined by the main services Interface.
This way, over time, other backend implementations of the Schedule and Security services can be added.
</p>
Modified: turbine/core/trunk/xdocs/how-to-help.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/how-to-help.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/how-to-help.xml (original)
+++ turbine/core/trunk/xdocs/how-to-help.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
Modified: turbine/core/trunk/xdocs/howto/action-event-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/action-event-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/action-event-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/action-event-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
Modified: turbine/core/trunk/xdocs/howto/configuration-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/configuration-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/configuration-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/configuration-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -28,10 +29,10 @@
<section name="Configurating Turbine">
<p>
With Turbine 2.3, there are now two different ways to configure Turbine. The old
-classic way was to provide a TurbineResources.properties file in the standard
+classic way was to provide a TurbineResources.properties file in the standard
properties format. However, added to 2.3 is the ability to specify an XML based
TurbineConfiguration.xml file that instructs Turbine how to load properties from
-multiple sources.
+multiple sources.
</p>
</section>
@@ -39,7 +40,7 @@
<p>
In the classic development environment, the developer has one environment, there is
a QA environment, and then production. While all of these environments strive to be
-as similar as possible, there are often difference betweent them. For instance, in
+as similar as possible, there are often difference betweent them. For instance, in
the development environment, you might want to not have Turbine cache templates, that
way, as you change them, they are just reloaded. But in test and production you might
need them to be non reloading for performance. There are many other situations like this.
@@ -68,11 +69,11 @@
<param-name>properties</param-name>
<param-value>
/WEB-INF/conf/TurbineResources.properties
- </param-value>
+ </param-value>
</init-param>
-
+
<load-on-startup>1</load-on-startup>
- </servlet>
+ </servlet>
]]></source>
<p>
@@ -85,12 +86,12 @@
<p>
The TurbineConfiguration.xml file doesn't contain any configuration data itself, instead
it points at other files that may have configuration data. Turbine leverages Commons-Configuration's
-ConfigurationFactory to access the data. For more information, look at
+ConfigurationFactory to access the data. For more information, look at
<a href="http://jakarta.apache.org/commons/sandbox/configuration/">Configuration</a> homepage.
</p>
<p>
-To specify the location of your TurbineConfiguration.xml file, just change your servlet init
+To specify the location of your TurbineConfiguration.xml file, just change your servlet init
parameters to this:
</p>
<source test=""><![CDATA[
@@ -101,11 +102,11 @@
<param-name>configuration</param-name>
<param-value>
/WEB-INF/conf/TurbineConfiguration.xml
- </param-value>
+ </param-value>
</init-param>
-
+
<load-on-startup>1</load-on-startup>
- </servlet>
+ </servlet>
]]>
</source>
@@ -122,7 +123,7 @@
]]></source>
<p>
-The configurations specified first override the values of configurations specified
+The configurations specified first override the values of configurations specified
afterwords. So, if the configuration value "mail.server" is specified as mymailserver.mycompany.com in
your JNDI settings, and localhost in the TurbineResources.properties, then when you issue:
</p>
Modified: turbine/core/trunk/xdocs/howto/context-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/context-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/context-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/context-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2001-2006 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
Modified: turbine/core/trunk/xdocs/howto/extend-user-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/extend-user-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/extend-user-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/extend-user-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -27,9 +28,9 @@
<section name="Important note">
<p>
- The information in this HOWTO pertains to Turbine 2.2. Please refer
- to the <a href="../services/torque-security-service.html">Torque
- Security Service</a> page for information on extending TurbineUser
+ The information in this HOWTO pertains to Turbine 2.2. Please refer
+ to the <a href="../services/torque-security-service.html">Torque
+ Security Service</a> page for information on extending TurbineUser
in Turbine 2.3 and beyond.
</p>
</section>
@@ -213,8 +214,8 @@
There are two ways in which additional data in your extended TurbineUser
object can be stored. The first, and simplest method, is to store it in
the perm hashtable. As described earlier, any data in the perm hashtable
- not mapped to a database column will get serialized into the
- TURBINE_USER.OBJECTDATA column. The second, and perferred method, is to
+ not mapped to a database column will get serialized into the
+ TURBINE_USER.OBJECTDATA column. The second, and perferred method, is to
use additional database column(s) for storage.
</p>
<p>
@@ -257,7 +258,7 @@
<p>
If you choose to use additional database columns, you will not have
any of the drawbacks mentioned above. Using the additional columns
- is the approach that should be taken unless you have a
+ is the approach that should be taken unless you have a
<strong>VERY</strong> good reason not to do so.
</p>
</section>
Modified: turbine/core/trunk/xdocs/howto/hibernate-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/hibernate-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/hibernate-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/hibernate-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -34,15 +35,15 @@
You just use POJO (Plain Old Java Objects) versus generated objects.
</li>
<li>
- You can either start with Java objects and create your database schema from there, or
+ You can either start with Java objects and create your database schema from there, or
start with a database schema, and map the Java objects to the schema.
</li>
<li>
Extensive performance optimizations built into the Hibernate engine.
- </li>
+ </li>
<li>
Leverage Avalon component use in Turbine 2.3!
- </li>
+ </li>
</ol>
</p>
<p>
@@ -55,27 +56,27 @@
<ol>
<li>
Configure project dependencies.
- </li>
+ </li>
<li>
Directory Structures
</li>
-
+
<li>
Setup Avalon component configuration.
</li>
-
+
<li>
Setup Hibernate mapping files.
</li>
<li>
Create static ServiceLocator class.
- </li>
+ </li>
<li>
Create filter that manages the Hibernate Session.
</li>
<li>
Setup PersitenceException handling
- </li>
+ </li>
</ol>
</p>
@@ -89,9 +90,9 @@
/src/java/com/my/project/bizobj business objects reside
/src/java/com/my/project/om POJO objects mapped to database reside
/src/java/com/my/project/om/persist manager objects that faciliate retrieve POJO objects
- /src/java/com/my/project/om/filter Servlet Filter lives that maintains the Hibernate Session
+ /src/java/com/my/project/om/filter Servlet Filter lives that maintains the Hibernate Session
/src/java/ where hibernate.hbm.xml and hibernate.cfg.xml files live
-
+
</source>
</section>
@@ -104,47 +105,47 @@
<source>
<![CDATA[
<dependency>
- <id>hibernate</id>
+ <id>hibernate</id>
<version>2.0-beta6</version>
- <properties>
+ <properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
<id>hibernate:hibernate-avalon</id>
<version>0.1</version>
- <properties>
+ <properties>
<war.bundle.jar>true</war.bundle.jar>
- </properties>
- </dependency>
+ </properties>
+ </dependency>
<dependency>
- <id>dom4j</id>
+ <id>dom4j</id>
<version>1.4</version>
- <properties>
+ <properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
- <id>cglib</id>
+ <id>cglib</id>
<version>rc2-1.0</version>
- <properties>
+ <properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
<dependency>
- <id>jcs</id>
+ <id>jcs</id>
<version>1.0-dev</version>
- <properties>
+ <properties>
<war.bundle.jar>true</war.bundle.jar>
</properties>
- </dependency>
+ </dependency>
]]>
- </source>
+ </source>
<p>
The key jar file is the hibernate-avalon.jar file, it contains the Avalon wrapper
for Hibernate, and can be used with any Avalon container.
</p>
-
+
</section>
<section name="Setting up Avalon Configuration" >
@@ -164,12 +165,12 @@
class="net.sf.hibernate.avalon.HibernateServiceImpl">
</component>
</my-system>
-
+
]]>
- </source>
+ </source>
<p>
- The componentRoles file also defines how to access the component. Here is a
+ The componentRoles file also defines how to access the component. Here is a
very simple componentRoles.xml file:
</p>
<source>
@@ -179,14 +180,14 @@
<role
name="net.sf.hibernate.avalon.HibernateService"
shorthand="hibernate"
- default-class="net.sf.hibernate.avalon.HibernateServiceImpl"/>
+ default-class="net.sf.hibernate.avalon.HibernateServiceImpl"/>
</role-list>
-
+
]]>
- </source>
+ </source>
</section>
-
-
+
+
<section name="Setup Hibernate mapping files">
<p>
@@ -210,7 +211,7 @@
Currently this class is not integrated into Turbine, so you will need to provide an implemation yourself.
This provides a static method of retrieving your Hibernate Session.
</p>
-
+
<source>
<![CDATA[
package com.upstate.cellculture.om.persist;
@@ -305,14 +306,14 @@
<section name="Create Servlet Filter.">
<p>
- The servlet Filter is required if you use lazy loading of objects because you need to open a Hibernate sesion, and keeps it open through the view layer.
+ The servlet Filter is required if you use lazy loading of objects because you need to open a Hibernate sesion, and keeps it open through the view layer.
This ensures that each user get's their own Hibernate Session. ?? Should this be done
through some sort of SessionValidator?
</p>
-
+
<source>
-<![CDATA[
+<![CDATA[
package com.upstate.cellculture.filter;
import java.io.IOException;
@@ -504,7 +505,7 @@
<section name="Setup PersitenceException handling">
<p>
By catching a generice Persistence Exception that wraps all the
- thrown exceptions we can just catch a single exception and then
+ thrown exceptions we can just catch a single exception and then
retrieve what type of exception it is.
</p>
<source>
Modified: turbine/core/trunk/xdocs/howto/ide-vaj-wte-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/ide-vaj-wte-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/ide-vaj-wte-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/ide-vaj-wte-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
<header>
@@ -31,7 +32,7 @@
Java WebSphere Test Environment.
</p>
<p>
- This tutorial works with VAJava 3.5.2 and 3.5.3. Please tell us if you
+ This tutorial works with VAJava 3.5.2 and 3.5.3. Please tell us if you
find that it works with other versions.
</p>
@@ -53,11 +54,11 @@
<p>
You need to create a project : Turbine
</p>
-
+
<p>
- Import into Turbine project all JARS/SRC associated with the specific
+ Import into Turbine project all JARS/SRC associated with the specific
Turbine release
- </p>
+ </p>
</section>
@@ -91,7 +92,7 @@
create another 2 subdirectories : <code>servlets</code> and
<code>web</code>.
</p>
-
+
<p>
Create the following directories (which is similiar to the TDK distribution)
under the web directory.
@@ -101,11 +102,11 @@
<li> stylesheets</li>
<li> templates</li>
<li> WEB-INF/conf</li>
- </p>
+ </p>
<p>
- Copy the TurbineResource.properties file to the "WEB-INF/conf" directory. The templates,
+ Copy the TurbineResource.properties file to the "WEB-INF/conf" directory. The templates,
logs etc. directories are quite self explanetory I think.
- </p>
+ </p>
</section>
@@ -127,9 +128,9 @@
<code>org.apache.turbine.Turbine</code>
<servlet-path>/ServletRedirector</servlet-path>
<autostart>true</autostart>
- </servlet>
+ </servlet>
</webapp>
-]]></source>
+]]></source>
</p>
</section>
Modified: turbine/core/trunk/xdocs/howto/index.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/index.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/index.xml (original)
+++ turbine/core/trunk/xdocs/howto/index.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2001-2006 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
Modified: turbine/core/trunk/xdocs/howto/intake-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/intake-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/intake-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/intake-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -171,7 +172,6 @@
Here is an example of the element (with no other sub-elements):
</p>
<source><![CDATA[
-<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE input-data SYSTEM
"http://jakarta.apache.org/turbine/dtd/intake_2_3.dtd">
<input-data basePackage="ca.yorku.devteam.inca.clients.skeleton.">
Modified: turbine/core/trunk/xdocs/howto/jboss-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/jboss-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/jboss-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/jboss-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * Copyright 2001-2006 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -37,7 +38,7 @@
<p>
<ol>
- <li>Edit the startup.sh:
+ <li>Edit the startup.sh:
<p>
$BASEDIR/catalina.sh run -nonaming "$@" (-nonaming does not work with start)
</p>
@@ -55,7 +56,7 @@
<p>
I probably have extra jars in the WEB-INF/lib at the moment, but IT WORKS!
</p>
-
+
<source>
WEB-INF/lib
TestBeanClient.jar
@@ -89,10 +90,10 @@
xmlrpc.jar
</source>
- <p>
+ <p>
THIS EXAMPLE JNDI CODE NOW RUNS: (servlet from within TDK)
</p>
-
+
<source><![CDATA[
try
{
@@ -118,7 +119,7 @@
catch(Exception e)
{
out.println("<LI>Context failed: " + e);
-}
+}
]]></source>
</section>
Modified: turbine/core/trunk/xdocs/howto/jsp-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/jsp-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/jsp-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/jsp-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -49,7 +50,7 @@
template.homepage=/index.jsp (or whatever jsp you want for the start
page)
-template.login=/login.jsp (or whatever jsp you want for the login
+template.login=/login.jsp (or whatever jsp you want for the login
form)
page.default=JspPage
Modified: turbine/core/trunk/xdocs/howto/ldap-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/ldap-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/ldap-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/ldap-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
Modified: turbine/core/trunk/xdocs/howto/migrate-from-2_1-howto.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/migrate-from-2_1-howto.xml?rev=615328&r1=615327&r2=615328&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/migrate-from-2_1-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/migrate-from-2_1-howto.xml Fri Jan 25 12:25:05 2008
@@ -1,21 +1,22 @@
<?xml version="1.0"?>
-<!--
-/*
- * 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.
- */
- -->
+<!--
+ 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.
+-->
<document>
@@ -27,8 +28,8 @@
<section name="Important note">
<p>
- The information in this HOWTO pertains to Turbine 2.2. Please refer
- to the <a href="migrate-from-2_2-howto.html">Migrating from
+ The information in this HOWTO pertains to Turbine 2.2. Please refer
+ to the <a href="migrate-from-2_2-howto.html">Migrating from
2.2 to 2.3</a> page for information on migating to Turbine 2.3.
</p>
</section>
@@ -44,8 +45,8 @@
Of course, this depends quite a bit on how much of Turbine your
application actually uses. You may find migrating to 2.2 to be
quite a chore, but it is well worth the effort. Most of the
- pain in figuring out this migration process has been documented
- in the mailing list archives, but is summarized here for your
+ pain in figuring out this migration process has been documented
+ in the mailing list archives, but is summarized here for your
convenience.
</p>
</section>
@@ -60,9 +61,9 @@
<section name="Build and Properties Files">
<p>
- The structure of the build files used by Turbine has changed
- quite a bit with the 2.2 release. The easiest way of obtaining
- a reference set of property (and build files) is to install
+ The structure of the build files used by Turbine has changed
+ quite a bit with the 2.2 release. The easiest way of obtaining
+ a reference set of property (and build files) is to install
version 2.2 of the TDK and generate the demo application.
</p>
<p>
@@ -76,9 +77,9 @@
to your build directory.</li>
<li>Merge <code>build.xml</code> from the demo application
to your existing build file (if you have only ever used the
- default build file supplied with the tdk then I assume you
+ default build file supplied with the tdk then I assume you
can just replace your file with the new one).</li>
- <li>Copy <code>WEB-INF/conf/TurbineResources.template</code> and
+ <li>Copy <code>WEB-INF/conf/TurbineResources.template</code> and
<code>WEB-INF/conf/Torque.template</code>) to your application
and apply changes as needed (it is up to you as to how much you
hard code into your application template and how much you allow
@@ -87,7 +88,7 @@
</ul>
</p>
<p>
- See the Torque
+ See the Torque
<a href="http://jakarta.apache.org/turbine/torque/properties-reference.html">
Properties Reference</a> for full details of the available properties.
</p>
@@ -95,30 +96,30 @@
<section name="Libraries">
<p>
- Turbine and Torque use updated versions of a number of
- libraries (jar files). Take a look at the WEB-INF/lib directory
- of the TDK sample application to see which libraries have been
- updated and replace the files in the lib directory of your
+ Turbine and Torque use updated versions of a number of
+ libraries (jar files). Take a look at the WEB-INF/lib directory
+ of the TDK sample application to see which libraries have been
+ updated and replace the files in the lib directory of your
application as needed.
</p>
<p>
Note that if you have applied local changes to Turbine itself
then you should ensure that your changes have made it into the
- Turbine 2.2 and Torque 3.0 releases. If any of your changes
- have not made it then you will need to port these changes forward
+ Turbine 2.2 and Torque 3.0 releases. If any of your changes
+ have not made it then you will need to port these changes forward
and build your own versions of the Turbine and Torque jar files
- (while you are there you may as well create patches and submit
- them to the relevant modules in Scarab so that they can be
+ (while you are there you may as well create patches and submit
+ them to the relevant modules in Scarab so that they can be
included in future releases).
</p>
<p>
By default Torque will utilize a set of Velocity templates that
- you need to extract from the Torque jar file (see the
- <code>torque.templatePath</code> property). Unless you have a
+ you need to extract from the Torque jar file (see the
+ <code>torque.templatePath</code> property). Unless you have a
need to alter these templates you may prefer to use these directly
- from the jar file. To do this you need to set the
+ from the jar file. To do this you need to set the
<code>torque.useClasspath</code> property to <code>true</code> in
- <code>build.peoperties</code>. In any case, you should either
+ <code>build.peoperties</code>. In any case, you should either
replace or delete the old versions of these templates from your
existing project.
</p>
@@ -239,14 +240,14 @@
someOtherObject.save(conn);
Transaction.commit(conn);
}
-catch (TorqueException ex)
+catch (TorqueException ex)
{
try
{
Transaction.rollback(conn);
}
catch (TorqueException ex2)
- {
+ {
Log.error(ex2);
}
Log.error(ex);
@@ -259,10 +260,10 @@
<p>
Methods generated by Torque that previously had a return type of
<code>Vector</code> now have a return type of <code>List</code>.
- If you have not already been doing so you should switch to
- retrieving the results of these methods into variables declared
- as <code>List</code>. While you are at it you might like to
- update any of your own code to use <code>ArrayList</code> in
+ If you have not already been doing so you should switch to
+ retrieving the results of these methods into variables declared
+ as <code>List</code>. While you are at it you might like to
+ update any of your own code to use <code>ArrayList</code> in
preference to <code>Vector</code>.
</p>
</section>
@@ -274,7 +275,7 @@
your code to match.
</p>
<p>
- Note that the exception thrown by <code>save()</code> methods is
+ Note that the exception thrown by <code>save()</code> methods is
determined by the Torque property <code>torque.saveException</code>
which defaults to <code>Exception</code>.
</p>
@@ -292,8 +293,8 @@
<p>
Read over the Torque Schema Reference to find out what to change
in your project-schema.xml file. The main changes are the
- deprecation of sequence and autoIncrement idMethods and the
- addition of the javaType attribute to column elements
+ deprecation of sequence and autoIncrement idMethods and the
+ addition of the javaType attribute to column elements
(Torque can now work with object types).
</p>
<p>
@@ -349,21 +350,21 @@
<section name="Maven">
<p>
- You may like to consider using
+ You may like to consider using
<a href="http://jakarta.apache.org/turbine/maven/">Maven</a> to
- build your project. The document
+ build your project. The document
<a href="http://wiki.apache.org/turbine/TDK/Maven">
- Starting your project and database with TDK2.2 and Maven</a>
- provides some information that can be adapted for this purpose
- (jump down to the "Moving The Sample" heading for the
+ Starting your project and database with TDK2.2 and Maven</a>
+ provides some information that can be adapted for this purpose
+ (jump down to the "Moving The Sample" heading for the
documentation relevant to an existing project).
</p>
</section>
<section name="Updates to this document">
<p>
- This document is by no means complete or totally accurate. We welcome
- suggestions as to how it might be improved, particularly if you have
+ This document is by no means complete or totally accurate. We welcome
+ suggestions as to how it might be improved, particularly if you have
just completed migrating an application by following this howto.
</p>
</section>