You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/05/05 08:58:51 UTC
svn commit: r535465 [36/49] - in /jakarta/turbine/fulcrum/trunk: ./ bsf/
bsf/src/java/org/apache/fulcrum/bsf/ bsf/src/test/ bsf/xdocs/ cache/
cache/src/java/org/apache/fulcrum/cache/
cache/src/java/org/apache/fulcrum/cache/impl/ cache/src/test/ cache/s...
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/jsp/TurbineJspService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/jsp/TurbineJspService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/jsp/TurbineJspService.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/jsp/TurbineJspService.java Fri May 4 23:58:06 2007
@@ -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.
*/
@@ -67,13 +70,13 @@
*/
/*
- public void addDefaultObjects(RunData data)
- {
- HttpServletRequest req = data.getRequest();
- //req.setAttribute(LINK, new JspLink(data));
- req.setAttribute(RUNDATA, data);
- }
- */
+ * public void addDefaultObjects(RunData data)
+ * {
+ * HttpServletRequest req = data.getRequest();
+ * //req.setAttribute(LINK, new JspLink(data));
+ * req.setAttribute(RUNDATA, data);
+ * }
+ */
/**
* The buffer size
@@ -93,12 +96,12 @@
* wrapped into a ServiceException and rethrown.
*/
/*
- public void handleRequest(RunData data, String filename)
- throws ServiceException
- {
- handleRequest(data, filename, false);
- }
- */
+ * public void handleRequest(RunData data, String filename)
+ * throws ServiceException
+ * {
+ * handleRequest(data, filename, false);
+ * }
+ */
/**
* Process the request
@@ -110,56 +113,56 @@
* wrapped into a ServiceException and rethrown.
*/
/*
- public void handleRequest(RunData data, String filename, boolean isForward)
- throws ServiceException
- {
- // template name with relative path
- String relativeTemplateName = getRelativeTemplateName(filename);
-
- if (relativeTemplateName == null)
- {
- throw new ServiceException(
- "Template " + filename + " not found in template paths");
- }
-
- // get the RequestDispatcher for the JSP
- RequestDispatcher dispatcher = data.getServletContext()
- .getRequestDispatcher(relativeTemplateName);
-
- try
- {
- if (isForward)
- {
- // forward the request to the JSP
- dispatcher.forward( data.getRequest(), data.getResponse() );
- }
- else
- {
- data.getOut().flush();
- // include the JSP
- dispatcher.include( data.getRequest(), data.getResponse() );
- }
- }
- catch(Exception e)
- {
- // as JSP service is in Alpha stage, let's try hard to send the error
- // message to the browser, to speed up debugging
- try
- {
- data.getOut().print("Error encountered processing a template: "+filename);
- e.printStackTrace(data.getOut());
- }
- catch(IOException ignored)
- {
- }
-
- // pass the exception to the caller according to the general
- // contract for tamplating services in Turbine
- throw new ServiceException(
- "Error encountered processing a template:" + filename, e);
- }
- }
- */
+ * public void handleRequest(RunData data, String filename, boolean isForward)
+ * throws ServiceException
+ * {
+ * // template name with relative path
+ * String relativeTemplateName = getRelativeTemplateName(filename);
+ *
+ * if (relativeTemplateName == null)
+ * {
+ * throw new ServiceException(
+ * "Template " + filename + " not found in template paths");
+ * }
+ *
+ * // get the RequestDispatcher for the JSP
+ * RequestDispatcher dispatcher = data.getServletContext()
+ * .getRequestDispatcher(relativeTemplateName);
+ *
+ * try
+ * {
+ * if (isForward)
+ * {
+ * // forward the request to the JSP
+ * dispatcher.forward( data.getRequest(), data.getResponse() );
+ * }
+ * else
+ * {
+ * data.getOut().flush();
+ * // include the JSP
+ * dispatcher.include( data.getRequest(), data.getResponse() );
+ * }
+ * }
+ * catch(Exception e)
+ * {
+ * // as JSP service is in Alpha stage, let's try hard to send the error
+ * // message to the browser, to speed up debugging
+ * try
+ * {
+ * data.getOut().print("Error encountered processing a template: "+filename);
+ * e.printStackTrace(data.getOut());
+ * }
+ * catch(IOException ignored)
+ * {
+ * }
+ *
+ * // pass the exception to the caller according to the general
+ * // contract for tamplating services in Turbine
+ * throw new ServiceException(
+ * "Error encountered processing a template:" + filename, e);
+ * }
+ * }
+ */
/**
* Currently a no-op. This method must be implemented so that the
@@ -247,32 +250,32 @@
}
/*
- public void doBuildBeforeAction(RunData data)
- {
- addDefaultObjects(data);
-
- try
- {
- //We try to set the buffer size from defaults
- data.getResponse().setBufferSize(getDefaultBufferSize());
- }
- catch (IllegalStateException ise )
- {
- //If the response was already commited, we die silently
- //No logger here?
- }
- }
-
- public void doBuildAfterAction(RunData data)
- {
- // do nothing
- }
-
- public void doPostBuild(RunData data)
- {
- // do nothing
- }
- */
+ * public void doBuildBeforeAction(RunData data)
+ * {
+ * addDefaultObjects(data);
+ *
+ * try
+ * {
+ * //We try to set the buffer size from defaults
+ * data.getResponse().setBufferSize(getDefaultBufferSize());
+ * }
+ * catch (IllegalStateException ise )
+ * {
+ * //If the response was already commited, we die silently
+ * //No logger here?
+ * }
+ * }
+ *
+ * public void doBuildAfterAction(RunData data)
+ * {
+ * // do nothing
+ * }
+ *
+ * public void doPostBuild(RunData data)
+ * {
+ * // do nothing
+ * }
+ */
// ---------------- Avalon Lifecycle Methods ---------------------
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/ContextAdapter.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/ContextAdapter.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/ContextAdapter.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/ContextAdapter.java Fri May 4 23:58:06 2007
@@ -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: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/DefaultVelocityService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/DefaultVelocityService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/DefaultVelocityService.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/DefaultVelocityService.java Fri May 4 23:58:06 2007
@@ -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.
*/
@@ -104,7 +107,7 @@
private EventCartridge eventCartridge;
/**
- * Whether or not to use the eventCartridge. Defaults to true.
+ * Whether or not to use the eventCartridge. Defaults to true.
* Can be used to turn off EC processing.
*/
private boolean eventCartridgeEnabled = true;
@@ -397,7 +400,7 @@
throws ConfigurationException
{
// put conf into object to pass to the velocity engine
- velocityConf =
+ velocityConf =
new org.apache.commons.configuration.BaseConfiguration();
List ecconfig = null;
String logPath = null;
@@ -417,10 +420,10 @@
{
getLogger().info("No Velocity EventCartridges configured.");
}
-
+
// Now we have to perform a couple of path translations
// for our log file and template paths.
- logPath =
+ logPath =
oldConf.getString(VelocityEngine.RUNTIME_LOG, null);
if (logPath == null || logPath.length() == 0)
{
@@ -447,27 +450,27 @@
else
{
// trick compiler
- if (true)
+ if (true)
{
throw new ConfigurationException(
- "Use of avalon-style configuration not completed yet");
+ "Use of avalon-style configuration not completed yet");
}
-
- final Configuration eventCartridgeConfs =
+
+ final Configuration eventCartridgeConfs =
conf.getChild("event-cartriges", false);
if (eventCartridgeConfs == null)
{
- ecconfig = Collections.EMPTY_LIST;
+ ecconfig = Collections.EMPTY_LIST;
}
else
{
- Configuration[] classNameConfs =
+ Configuration[] classNameConfs =
eventCartridgeConfs.getChildren("classname");
if (classNameConfs == null)
{
- ecconfig = Collections.EMPTY_LIST;
+ ecconfig = Collections.EMPTY_LIST;
}
- else
+ else
{
ecconfig = new ArrayList(classNameConfs.length);
for (int i=0; i < classNameConfs.length; i++)
@@ -478,24 +481,24 @@
}
/*
- final Configuration pathConfs =
- conf.getChild("event-cartriges", false);
- if (pathConfs != null)
- {
- Configuration[] nameVal = ecConfs.getChildren();
- for (int i=0; i < nameVal.length; i++)
- {
- String key = nameVal[i].getName();
- String val = nameVal[i].getValue();
- }
- }
- */
+ * final Configuration pathConfs =
+ * conf.getChild("event-cartriges", false);
+ * if (pathConfs != null)
+ * {
+ * Configuration[] nameVal = ecConfs.getChildren();
+ * for (int i=0; i < nameVal.length; i++)
+ * {
+ * String key = nameVal[i].getName();
+ * String val = nameVal[i].getValue();
+ * }
+ * }
+ */
}
initEventCartridges(ecconfig);
- // check if path to logfile needs translation to webapp root
- if ( !(new File(logPath).isAbsolute()) )
+ // check if path to logfile needs translation to webapp root
+ if ( !(new File(logPath).isAbsolute()) )
{
logPath = getRealPath(logPath);
}
@@ -615,7 +618,7 @@
}
// ---------------- Avalon Lifecycle Methods ---------------------
-
+
/**
* Avalon component lifecycle method
*/
@@ -625,12 +628,12 @@
try
{
velocityEngine = new VelocityEngine();
-
- // clear the property to prepare for new value,
+
+ // clear the property to prepare for new value,
//is this needed?
Iterator i = velocityConf.getKeys();
- while (i.hasNext())
- {
+ while (i.hasNext())
+ {
velocityEngine.clearProperty((String)i.next());
}
@@ -638,7 +641,7 @@
.getExtendedProperties(velocityConf));
velocityEngine.init();
velocityConf = null;
-
+
}
catch (Exception e)
{
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/VelocityService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/VelocityService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/VelocityService.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/VelocityService.java Fri May 4 23:58:06 2007
@@ -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.
*/
@@ -35,7 +38,7 @@
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @version $Id$
*/
-public interface VelocityService
+public interface VelocityService
{
String ROLE = VelocityService.class.getName();
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/VelocityServiceFacade.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/VelocityServiceFacade.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/VelocityServiceFacade.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/template/velocity/VelocityServiceFacade.java Fri May 4 23:58:06 2007
@@ -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.
*/
@@ -54,7 +57,7 @@
{
return velocityService;
}
-
+
protected static void setService(VelocityService velocityService){
VelocityServiceFacade.velocityService = velocityService;
}
@@ -137,7 +140,7 @@
* @see org.apache.fulcrum.velocity.VelocityService#handleRequest(Context,
* String, Writer)
*/
- public static void handleRequest(Context context, String filename,
+ public static void handleRequest(Context context, String filename,
Writer writer)
throws TemplateException
{
Modified: jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/java/org/apache/fulcrum/util/WordWrapUtils.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.util;
/*
- * 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.
*/
import java.util.NoSuchElementException;
@@ -22,7 +25,7 @@
import org.apache.commons.lang.StringUtils;
/**
* <code>WordWrapUtils</code> is a utility class to assist with word wrapping.
- *
+ *
* @author Henri Yandell
* @author Stephen Colebourne
* @version $Id$
@@ -36,7 +39,7 @@
* Wraps a block of text to a specified line length.
* <p>
* This method takes a block of text, which might have long lines in it
- * and wraps the long lines based on the supplied wrapColumn parameter.
+ * and wraps the long lines based on the supplied wrapColumn parameter.
* It was initially implemented for use by VelocityEmail. If there are tabs
* in inString, you are going to get results that are a bit strange,
* since tabs are a single character but are displayed as 4 or 8
@@ -72,7 +75,7 @@
}
/**
- * Wraps a single line of text.
+ * Wraps a single line of text.
* Called by wrapText() to do the real work of wrapping.
*
* @param line a line which is in need of word-wrapping
@@ -121,16 +124,16 @@
//--------------------------------------------------------------------------
/**
- * Create a word-wrapped version of a String. Wrap at 80 characters and
- * use newlines as the delimiter. If a word is over 80 characters long
+ * Create a word-wrapped version of a String. Wrap at 80 characters and
+ * use newlines as the delimiter. If a word is over 80 characters long
* use a - sign to split it.
*/
public static String wordWrap(String str) {
return wordWrap(str, 80, "\n", "-");
}
/**
- * Create a word-wrapped version of a String. Wrap at a specified width and
- * use newlines as the delimiter. If a word is over the width in lenght
+ * Create a word-wrapped version of a String. Wrap at a specified width and
+ * use newlines as the delimiter. If a word is over the width in lenght
* use a - sign to split it.
*/
public static String wordWrap(String str, int width) {
Modified: jakarta/turbine/fulcrum/trunk/template/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,6 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<componentConfig>
<template>
<default-page-template>/index.jsp</default-page-template>
<default-layout-template>/index.jsp</default-layout-template>
</template>
-</componentConfig>
\ No newline at end of file
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/template/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.template.TemplateService"
shorthand="template"
default-class="org.apache.fulcrum.template.TurbineTemplateService"/>
-</role-list>
\ No newline at end of file
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/template/src/test/org/apache/fulcrum/template/TemplateServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/src/test/org/apache/fulcrum/template/TemplateServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/src/test/org/apache/fulcrum/template/TemplateServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/template/src/test/org/apache/fulcrum/template/TemplateServiceTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.template;
/*
- * Copyright 2000-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.
*/
@@ -27,14 +30,14 @@
* TemplateServiceTest
*
* @author <a href="paulsp@apache.org">Paul Spencer</a>
- * @author <a href="epugh@upstate.com">Eric Pugh</a>
+ * @author <a href="epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
public class TemplateServiceTest extends BaseUnitTest
{
private TemplateService templateService = null;
-
-
+
+
/**
* Defines the testcase name for JUnit.
@@ -84,7 +87,7 @@
*/
public void testSimpleAddGetCacheObject() throws Exception
{
-
-
+
+
}
}
Modified: jakarta/turbine/fulcrum/trunk/template/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/template/xdocs/changes.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ 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>Fulcrum BSF</title>
@@ -9,25 +27,25 @@
<release version="1.0-alpha-2" date="in SVN">
<action dev="seade" type="fix" issue="FULS10">
TemplateEmail.sendMultiple() was setting the character set to late.
- </action>
+ </action>
<action dev="sgoeschl" type="update">
Changed the signature of TemplateHtmlEmail.send() since it inherits
from Mail.send(). The method now throws an EmailException instead
of MessagingException which might break existing code.
- </action>
+ </action>
<action dev="sgoeschl" type="update">
Upgrading to javamail-1.3.2 and commons-email-1.0
- </action>
+ </action>
<action dev="epugh" type="add">
Fix EmailTemplate and HtmlEmailTemplate by providing a templateService
that can be manually passed in. Should be avalon components instead.
- </action>
+ </action>
<action dev="epugh" type="remove">
Remove facade class, this is implementation specific.
- </action>
+ </action>
<action dev="epugh" type="add">
Initial conversion to Avalon component.
- </action>
+ </action>
</release>
</body>
Modified: jakarta/turbine/fulcrum/trunk/template/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/template/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ 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>
@@ -13,14 +31,14 @@
<p>
This Service functions as a Template component.
</p>
-
+
<p>
- It is written
- for use in Turbine but it can be used in any container compatible
+ It is written
+ for use in Turbine but it can be used in any container compatible
with Avalon's ECM container.
- </p>
+ </p>
</section>
-
+
<section name="Configuration">
<p>
@@ -85,11 +103,11 @@
<p>
You can also place an expiration time on your objects so the Service will
automatically remove them when they expire. If you don't specify an expiration
- time, the Service uses 5 seconds. To see an example, look at the
+ time, the Service uses 5 seconds. To see an example, look at the
test case <a href="xref-test/org/apache/fulcrum/cache/CacheTest.html">CacheTest</a>
</p>
- </section>
+ </section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/template/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/template/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/template/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/template/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
<project
name="cache"
href="http://jakarta.apache.org/turbine/fulcrum/cache/">
@@ -15,4 +33,4 @@
<item name="Main" href="/index.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/project.properties Fri May 4 23:58:06 2007
@@ -1,5 +1,21 @@
+# 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.
# display the date on the site
maven.xdoc.date = left
-#help debug failing gump tests
-maven.junit.usefile=false
\ No newline at end of file
+# help debug failing gump tests
+maven.junit.usefile=false
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/project.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ 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.
+-->
<project>
<extend>${basedir}/../project.xml</extend>
<id>fulcrum-testcontainer</id>
@@ -17,19 +35,19 @@
</version>
</versions>
<dependencies>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
- </dependency>
+ </dependency>
<!-- Needed if testing with YAAFI -->
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.4</version>
</dependency>
-
+
<!-- Needed if testing with ECM -->
<dependency>
<groupId>excalibur-component</groupId>
@@ -37,48 +55,48 @@
<version>2.1</version>
<url>http://excalibur.apache.org/</url>
</dependency>
-
+
<dependency>
<groupId>excalibur-instrument</groupId>
<artifactId>excalibur-instrument-api</artifactId>
<version>2.1</version>
<url>http://excalibur.apache.org/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>excalibur-logger</groupId>
<artifactId>excalibur-logger</artifactId>
<version>2.1</version>
<url>http://excalibur.apache.org/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
</dependency>
-
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<url>http://jakarta.apache.org/log4j/</url>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>excalibur-pool</groupId>
<artifactId>excalibur-pool-api</artifactId>
<version>2.1</version>
<url>http://excalibur.apache.org/</url>
</dependency>
-
+
<dependency>
<groupId>avalon-logkit</groupId>
<artifactId>avalon-logkit</artifactId>
<version>2.1</version>
<url>http://avalon.apache.org</url>
- </dependency>
+ </dependency>
</dependencies>
@@ -95,7 +113,7 @@
</includes>
</resource>
</resources>
- </unitTest>
+ </unitTest>
</build>
</project>
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnitTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnitTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnitTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnitTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import junit.framework.TestCase;
@@ -21,14 +24,14 @@
* Base class for unit tests for components. This version doesn't load the container until the
* first request for a component. This allows the tester to populate the configurationFileName and
* roleFileName, possible one per test.
- *
+ *
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
*/
public class BaseUnitTest extends TestCase
{
-
+
public static final String CONTAINER_ECM="CONTAINER_ECM";
public static final String CONTAINER_YAAFI="CONTAINER_YAAFI";
/** Key used in the context for defining the application root */
@@ -44,11 +47,11 @@
private String roleFileName = "src/test/TestRoleConfig.xml";
/** Setup our default parameterFileName */
private String parameterFileName = null;
-
+
/**
* Gets the configuration file name for the container should use for this test. By default it
* is src/test/TestComponentConfig.
- *
+ *
* @param configurationFileName
*/
protected void setConfigurationFileName(String configurationFileName)
@@ -59,7 +62,7 @@
/**
* Override the role file name for the container should use for this test. By default it is
* src/test/TestRoleConfig.
- *
+ *
* @param roleFileName
*/
protected void setRoleFileName(String roleFileName)
@@ -69,14 +72,14 @@
/**
* Constructor for test.
- *
+ *
* @param testName name of the test being executed
*/
public BaseUnitTest(String testName)
{
super(testName);
}
-
+
/**
* Clean up after each test is run.
*/
@@ -90,7 +93,7 @@
}
/**
* Gets the configuration file name for the container should use for this test.
- *
+ *
* @return The filename of the configuration file
*/
protected String getConfigurationFileName()
@@ -99,7 +102,7 @@
}
/**
* Gets the role file name for the container should use for this test.
- *
+ *
* @return The filename of the role configuration file
*/
protected String getRoleFileName()
@@ -108,16 +111,16 @@
}
/**
* Gets the parameter file name for the container should use for this test.
- *
+ *
* @return The filename of the role configuration file
*/
protected String getParameterFileName()
{
return parameterFileName;
- }
+ }
/**
* Returns an instance of the named component. Starts the container if it hasn't been started.
- *
+ *
* @param roleName Name of the role the component fills.
* @throws ComponentException generic exception
*/
@@ -135,7 +138,7 @@
}
return container.lookup(roleName);
}
-
+
/**
* Helper method for converting to and from Merlin Unit TestCase.
* @param roleName
@@ -145,10 +148,10 @@
protected Object resolve(String roleName) throws ComponentException
{
return lookup(roleName);
- }
+ }
/**
* Releases the component
- *
+ *
* @param component
*/
protected void release(Object component)
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/Container.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/Container.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/Container.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/Container.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import org.apache.avalon.framework.activity.Disposable;
@@ -23,7 +26,7 @@
/**
* This is a simple interface around the ECM and Yaafi containers
*
- * @author <a href="mailto:epugh at opensourceconnections.com">Eric Pugh</a>
+ * @author <a href="mailto:epugh at opensourceconnections.com">Eric Pugh</a>
*/
public interface Container extends Initializable, Disposable
{
@@ -31,16 +34,16 @@
public static String COMPONENT_APP_ROOT = "componentAppRoot";
/** Alternate Merlin Friendly Key used in the context for defining the application root */
- public static String URN_AVALON_HOME = "urn:avalon:home";
+ public static String URN_AVALON_HOME = "urn:avalon:home";
/** Alternate Merlin Friendly Key used in the context for defining the application root */
- public static String URN_AVALON_TEMP = "urn:avalon:temp";
-
+ public static String URN_AVALON_TEMP = "urn:avalon:temp";
+
public void startup(String configFileName, String roleFileName, String parametersFileName);
-
+
public Object lookup(String roleName) throws ComponentException;
-
+
public void release(Object component);
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import java.io.File;
@@ -35,8 +38,8 @@
*/
public class ECMContainer extends AbstractLogEnabled implements Container
{
-
-
+
+
/** Component manager */
private ExcaliburComponentManager manager = new ExcaliburComponentManager();
/** Configurqation file */
@@ -64,9 +67,9 @@
getLogger().debug("Starting container...");
this.configFileName = configFileName;
this.roleFileName = roleFileName;
- File configFile = new File(configFileName);
+ File configFile = new File(configFileName);
if (!configFile.exists())
- {
+ {
throw new RuntimeException(
"Could not initialize the container because the config file could not be found:" + configFile);
}
@@ -118,7 +121,7 @@
context.put(COMPONENT_APP_ROOT, absolutePath);
context.put(URN_AVALON_HOME, absolutePath);
this.manager.contextualize(context);
-
+
this.manager.configure(sysConfig);
// Init ECM!!!!
this.manager.initialize();
@@ -151,9 +154,9 @@
{
this.manager.release(component);
}
-
+
public void release(Object component)
{
this.manager.release((Component)component);
- }
+ }
}
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import java.io.File;
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestAlternativeRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestAlternativeRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestAlternativeRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestAlternativeRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.testcontainer.SimpleComponent"
shorthand="SimpleComponent"
default-class="org.apache.fulcrum.testcontainer.AlternativeComponentImpl"/>
-</role-list>
\ No newline at end of file
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<componentConfig>
<SimpleComponent>
</SimpleComponent>
-</componentConfig>
\ No newline at end of file
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestComponentConfigIntegratedRoles.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestComponentConfigIntegratedRoles.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestComponentConfigIntegratedRoles.xml (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestComponentConfigIntegratedRoles.xml Fri May 4 23:58:06 2007
@@ -1,6 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<my-system>
<component
role="org.apache.fulcrum.testcontainer.SimpleComponent"
- class="org.apache.fulcrum.testcontainer.AlternativeComponentImpl">
- </component>
-</my-system>
\ No newline at end of file
+ class="org.apache.fulcrum.testcontainer.AlternativeComponentImpl">
+ </component>
+</my-system>
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestParameters.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestParameters.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestParameters.properties (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestParameters.properties Fri May 4 23:58:06 2007
@@ -1 +1,17 @@
-BAR=BAR
\ No newline at end of file
+# 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.
+BAR=BAR
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
@@ -5,4 +24,4 @@
shorthand="SimpleComponent"
early-init="true"
default-class="org.apache.fulcrum.testcontainer.SimpleComponentImpl"/>
-</role-list>
\ No newline at end of file
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/AlternativeComponentImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/AlternativeComponentImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/AlternativeComponentImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/AlternativeComponentImpl.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import java.io.File;
@@ -64,7 +67,7 @@
else {
appRoot2 = (String)context.get("urn:avalon:home");
}
-
+
}
/**
* @return Returns the appRoot.
@@ -82,4 +85,4 @@
return appRoot2;
}
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java Fri May 4 23:58:06 2007
@@ -1,25 +1,28 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import java.io.File;
import org.apache.avalon.framework.component.ComponentException;
/**
* Basic testing of the Container
- *
+ *
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
*/
@@ -27,14 +30,14 @@
{
/**
* Constructor for test.
- *
+ *
* @param testName name of the test being executed
*/
public EcmContainerTest(String testName)
{
super(testName);
}
-
+
public void setUp() throws Exception{
containerType=CONTAINER_ECM;
super.setUp();
@@ -119,7 +122,7 @@
}
catch (ComponentException e)
{
-
+
fail(e.getMessage());
}
}
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/SimpleComponent.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/SimpleComponent.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/SimpleComponent.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/SimpleComponent.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import org.apache.avalon.framework.component.Component;
@@ -31,8 +34,8 @@
void test();
-
+
public String getAppRoot();
-
+
public String getAppRoot2();
}
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/SimpleComponentImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/SimpleComponentImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/SimpleComponentImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/SimpleComponentImpl.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import java.io.File;
@@ -81,4 +84,4 @@
return appRoot2;
}
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.testcontainer;
/*
- * Copyright 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.
*/
import java.io.File;
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/changes.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ 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>Fulcrum</title>
@@ -7,32 +25,32 @@
</properties>
<body>
- <release version="1.0.5" date="2005-05-13">
+ <release version="1.0.5" date="2005-05-13">
<action dev="sgoeschl" type="change">
Changed the implementation wo work with fulcrum-yaafi 1.0.4-dev
since the initalization changed.
- </action>
- </release>
- <release version="1.0.4" date="2004-11-24">
+ </action>
+ </release>
+ <release version="1.0.4" date="2004-11-24">
<action dev="epugh" type="add">
By default use Yaafi as the Test container, but you can swap to ECM for
more "real" testing if required by doing <code>containerType=CONTAINER_ECM;</code>.
- </action>
+ </action>
<action dev="epugh" type="add">
Add helper "resolve" method that delegates to "lookup" to faciliate
using in both Merlin and ECM enviroments.
- </action>
+ </action>
<action dev="epugh" type="add" due-to="Ben Gidley">
Tweak documentation to be more explicit on where config files
are pulled from.
</action>
- </release>
- <release version="1.0-alpha-2" date="in cvs">
+ </release>
+ <release version="1.0-alpha-2" date="in cvs">
<action dev="epugh" type="add">
Add additional context value urn:avalon:home to be more
Merlin friendly.
</action>
- </release>
+ </release>
<release version="1.0-alpha-2" date="02-13-2004">
<action dev="epugh" type="add">
allow setup method of subclasses to throw exceptions if they want..
@@ -51,12 +69,12 @@
the various unit tests.
</action>
<action dev="quintonm" type="add">
- TestContainer component was added. This is to be used for
+ TestContainer component was added. This is to be used for
testing of the components so that we do not have a dependancy
on Plexus. The test container is based on ECM, which is what
Turbine is using. A base class for unit tests is also included.
</action>
-
+
</release>
</body>
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ 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>
@@ -53,7 +71,7 @@
</p>
<p>
If you are testing multiple config or role files, then just call <code>setConfigurationFileName()</code>
- or <code>setRoleFileName()</code> before doing your first lookup. The string you pass in should be prefixed from
+ or <code>setRoleFileName()</code> before doing your first lookup. The string you pass in should be prefixed from
the directory the JVM is running in (e.g. src/test/YOUR_CONFIG.xml).
</p>
@@ -68,14 +86,14 @@
for more information.
</p>
</subsection>
-
+
<subsection name="Configuring the Components">
<p>
- There are two ways of configuring your components. One is the
+ There are two ways of configuring your components. One is the
traditional TestComponentConfig.xml and TestRoleConfig.xml files
described below. Or, one that integrates the two, shown at the bottom.
</p>
-
+
<p>
First, here is the role configuration.
</p>
@@ -100,13 +118,13 @@
<algorithm>
<unix>org.apache.fulcrum.crypto.provider.UnixCrypt</unix>
<clear>org.apache.fulcrum.crypto.provider.ClearCrypt</clear>
- <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
- <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
-
+ <java>org.apache.fulcrum.crypto.provider.JavaCrypt</java>
+ <oldjava>org.apache.fulcrum.crypto.provider.OldJavaCrypt</oldjava>
+
</algorithm>
</crypto>
]]>
-</source>
+</source>
<p>
Or, the integrated roles and components file:
@@ -117,13 +135,13 @@
<my-system>
<component
role="org.apache.fulcrum.testcontainer.SimpleComponent"
- class="org.apache.fulcrum.testcontainer.AlternativeComponentImpl">
- </component>
+ class="org.apache.fulcrum.testcontainer.AlternativeComponentImpl">
+ </component>
</my-system>
]]>
-</source>
+</source>
- </subsection>
+ </subsection>
</section>
Modified: jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/testcontainer/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
<project
name="Test Container"
href="http://jakarta.apache.org/turbine/fulcrum/testcontainer/">
@@ -8,7 +26,7 @@
<item name="Turbine" href="http://jakarta.apache.org/turbine/"/>
<item name="Fulcrum" href="http://jakarta.apache.org/turbine/fulcrum/"/>
</links>
-
+
<menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
Modified: jakarta/turbine/fulcrum/trunk/upload/project.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/upload/project.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/upload/project.properties (original)
+++ jakarta/turbine/fulcrum/trunk/upload/project.properties Fri May 4 23:58:06 2007
@@ -1 +1,17 @@
+# 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org