svn commit: r642435 [4/5] - in /jakarta/cactus/trunk: ./ build-tools/ build-tools/src/main/resources/build-tools/ cactus-maven-skin/ cactus-maven-skin/src/main/resources/css/ cactus-site/ cactus-site/src/changes/ cactus-site/src/site/ cactus-site/src/s...

[se...@apache.org]

Modified: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactifyActionDelegate.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactifyActionDelegate.java?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactifyActionDelegate.java (original)
+++ jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactifyActionDelegate.java Fri Mar 28 16:39:13 2008
@@ -1,207 +1,207 @@
-/* 
- * ========================================================================
- * 
- * Copyright 2001-2003 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.
- * 
- * ========================================================================
- */
-package org.apache.cactus.eclipse.runner.ui;
-
-import java.io.File;
-import java.util.Vector;
-
-import org.apache.cactus.eclipse.runner.common.JarFilenameFilter;
-import org.eclipse.core.internal.resources.Project;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Action delegate to cactify a project.
- * 
- * @version $Id: CactifyActionDelegate.java 238816 2004-02-29 16:36:46Z vmassol $
- */
-public class CactifyActionDelegate implements IObjectActionDelegate
-{
-    /**
-     * The project selected by the user
-     */
-    private IJavaProject selectedProject;
-
-    /**
-     * The active part
-     */
-    private IWorkbenchPart part;
-
-    /**
-     * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
-     */
-    public void setActivePart(IAction theAction, IWorkbenchPart theTargetPart)
-    {
-        this.part = theTargetPart;
-    }
-
-    /**
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction theAction)
-    {
-        if (selectedProject != null)
-        {
-            CactusPlugin thePlugin = CactusPlugin.getDefault();
-				File commonLibDir = null;
-				File clientLibDir = null;
-
-            try {
-				commonLibDir = new File(Platform.asLocalURL(thePlugin.getBundle().getEntry("/" +CactusPlugin.CACTUS_LIBRARY_PATH +"/" +CactusPlugin.CACTUS_COMMON_LIBRARY_PATH)).getPath());
-				clientLibDir = new File(Platform.asLocalURL(thePlugin.getBundle().getEntry("/" +CactusPlugin.CACTUS_LIBRARY_PATH +"/" +CactusPlugin.CACTUS_CLIENT_LIBRARY_PATH)).getPath());
-            } catch (Exception ex) {
-            	CactusPlugin.log(ex);
-            }
-            
-            IClasspathEntry[] commonEntries =
-                getLibClassPathEntries(commonLibDir);
-            IClasspathEntry[] clientEntries =
-                getLibClassPathEntries(clientLibDir);
-            IClasspathEntry[] allNewEntries =
-                new IClasspathEntry[commonEntries.length
-                    + clientEntries.length];
-            System.arraycopy(
-                commonEntries,
-                0,
-                allNewEntries,
-                0,
-                commonEntries.length);
-            System.arraycopy(
-                clientEntries,
-                0,
-                allNewEntries,
-                commonEntries.length,
-                clientEntries.length);
-            try
-            {
-
-                IClasspathEntry[] existingEntries =
-                    selectedProject.getRawClasspath();
-                selectedProject.setRawClasspath(
-                    merge(existingEntries, allNewEntries),
-                    null);
-            }
-            catch (Exception e)
-            {
-                CactusPlugin.displayErrorMessage(
-                    CactusMessages.getString("Cactify.message.error"),
-                    e.getMessage(),
-                    null);
-            }
-        }
-    }
-
-    /**
-     * @see IActionDelegate#selectionChanged(IAction, ISelection)
-     */
-    public void selectionChanged(IAction theAction, ISelection theSelection)
-    {
-        selectedProject = null;
-        if (theSelection instanceof IStructuredSelection)
-        {
-            IStructuredSelection structuredSelection =
-                (IStructuredSelection) theSelection;
-            if (structuredSelection.size() == 1)
-            {
-                Object selectedResource = structuredSelection.getFirstElement();
-                if (selectedResource instanceof org.eclipse.core.internal.resources.Project)
-                {
-                	Project project = (Project) selectedResource;
-                    selectedProject = JavaCore.create(project);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a list of entries of jars files contained
-     * in the given directory. 
-     * @param theDirectory the directory to list jars from
-     * @return an array of jar entries
-     */
-    private IClasspathEntry[] getLibClassPathEntries(File theDirectory)
-    {
-        File[] jarFiles = theDirectory.listFiles(new JarFilenameFilter());
-        IClasspathEntry[] result = new IClasspathEntry[jarFiles.length];
-        for (int i = 0; i < jarFiles.length; i++)
-        {
-            File currentJarFile = jarFiles[i];
-            result[i] =
-                JavaCore.newLibraryEntry(
-                    new Path(currentJarFile.getAbsolutePath()),
-                    null,
-                    null);
-        }
-        return result;
-    }
-    /**
-     * @param theFirstArray an array of classpath entries
-     * @param theSecondArray an array of classpath entries
-     * @return the fusion of the two given arrays 
-     */
-    private static IClasspathEntry[] merge(
-        IClasspathEntry[] theFirstArray,
-        IClasspathEntry[] theSecondArray)
-    {
-
-        Vector result = new Vector();
-        for (int i = 0; i < theFirstArray.length; i++)
-        {
-            result.add(theFirstArray[i]);
-        }
-        for (int i = 0; i < theSecondArray.length; i++)
-        {
-            IClasspathEntry currentEntry = theSecondArray[i];
-            String currentEntryFileName = currentEntry.getPath().toFile().getName();
-            boolean entryAlreadyExists = false;
-            boolean isFile = false;
-            for (int j = 0; j < theFirstArray.length; j++)
-            {
-                IClasspathEntry comparedEntry = theFirstArray[j];
-                isFile = comparedEntry.getPath().toFile().getAbsolutePath().endsWith(".jar");
-                String comparedFileName = comparedEntry.getPath().toFile().getName();
-                if (comparedEntry.getPath().equals(currentEntry.getPath()) || (comparedFileName.equals(currentEntryFileName) && isFile))
-                {
-                    entryAlreadyExists = true;
-                    break;
-                }
-            }
-            if (!entryAlreadyExists)
-            {
-                result.add(currentEntry);
-            }
-        }
-        return (IClasspathEntry[]) result.toArray(
-            new IClasspathEntry[result.size()]);
-    }
-
-	public void setSelectedProject(IJavaProject selectedProject) {
-		this.selectedProject = selectedProject;
-	}
-}
+/* 
+ * ========================================================================
+ * 
+ * Copyright 2001-2003 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.
+ * 
+ * ========================================================================
+ */
+package org.apache.cactus.eclipse.runner.ui;
+
+import java.io.File;
+import java.util.Vector;
+
+import org.apache.cactus.eclipse.runner.common.JarFilenameFilter;
+import org.eclipse.core.internal.resources.Project;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IActionDelegate;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+
+/**
+ * Action delegate to cactify a project.
+ * 
+ * @version $Id: CactifyActionDelegate.java 238816 2004-02-29 16:36:46Z vmassol $
+ */
+public class CactifyActionDelegate implements IObjectActionDelegate
+{
+    /**
+     * The project selected by the user
+     */
+    private IJavaProject selectedProject;
+
+    /**
+     * The active part
+     */
+    private IWorkbenchPart part;
+
+    /**
+     * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
+     */
+    public void setActivePart(IAction theAction, IWorkbenchPart theTargetPart)
+    {
+        this.part = theTargetPart;
+    }
+
+    /**
+     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+     */
+    public void run(IAction theAction)
+    {
+        if (selectedProject != null)
+        {
+            CactusPlugin thePlugin = CactusPlugin.getDefault();
+				File commonLibDir = null;
+				File clientLibDir = null;
+
+            try {
+				commonLibDir = new File(Platform.asLocalURL(thePlugin.getBundle().getEntry("/" +CactusPlugin.CACTUS_LIBRARY_PATH +"/" +CactusPlugin.CACTUS_COMMON_LIBRARY_PATH)).getPath());
+				clientLibDir = new File(Platform.asLocalURL(thePlugin.getBundle().getEntry("/" +CactusPlugin.CACTUS_LIBRARY_PATH +"/" +CactusPlugin.CACTUS_CLIENT_LIBRARY_PATH)).getPath());
+            } catch (Exception ex) {
+            	CactusPlugin.log(ex);
+            }
+            
+            IClasspathEntry[] commonEntries =
+                getLibClassPathEntries(commonLibDir);
+            IClasspathEntry[] clientEntries =
+                getLibClassPathEntries(clientLibDir);
+            IClasspathEntry[] allNewEntries =
+                new IClasspathEntry[commonEntries.length
+                    + clientEntries.length];
+            System.arraycopy(
+                commonEntries,
+                0,
+                allNewEntries,
+                0,
+                commonEntries.length);
+            System.arraycopy(
+                clientEntries,
+                0,
+                allNewEntries,
+                commonEntries.length,
+                clientEntries.length);
+            try
+            {
+
+                IClasspathEntry[] existingEntries =
+                    selectedProject.getRawClasspath();
+                selectedProject.setRawClasspath(
+                    merge(existingEntries, allNewEntries),
+                    null);
+            }
+            catch (Exception e)
+            {
+                CactusPlugin.displayErrorMessage(
+                    CactusMessages.getString("Cactify.message.error"),
+                    e.getMessage(),
+                    null);
+            }
+        }
+    }
+
+    /**
+     * @see IActionDelegate#selectionChanged(IAction, ISelection)
+     */
+    public void selectionChanged(IAction theAction, ISelection theSelection)
+    {
+        selectedProject = null;
+        if (theSelection instanceof IStructuredSelection)
+        {
+            IStructuredSelection structuredSelection =
+                (IStructuredSelection) theSelection;
+            if (structuredSelection.size() == 1)
+            {
+                Object selectedResource = structuredSelection.getFirstElement();
+                if (selectedResource instanceof org.eclipse.core.internal.resources.Project)
+                {
+                	Project project = (Project) selectedResource;
+                    selectedProject = JavaCore.create(project);
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a list of entries of jars files contained
+     * in the given directory. 
+     * @param theDirectory the directory to list jars from
+     * @return an array of jar entries
+     */
+    private IClasspathEntry[] getLibClassPathEntries(File theDirectory)
+    {
+        File[] jarFiles = theDirectory.listFiles(new JarFilenameFilter());
+        IClasspathEntry[] result = new IClasspathEntry[jarFiles.length];
+        for (int i = 0; i < jarFiles.length; i++)
+        {
+            File currentJarFile = jarFiles[i];
+            result[i] =
+                JavaCore.newLibraryEntry(
+                    new Path(currentJarFile.getAbsolutePath()),
+                    null,
+                    null);
+        }
+        return result;
+    }
+    /**
+     * @param theFirstArray an array of classpath entries
+     * @param theSecondArray an array of classpath entries
+     * @return the fusion of the two given arrays 
+     */
+    private static IClasspathEntry[] merge(
+        IClasspathEntry[] theFirstArray,
+        IClasspathEntry[] theSecondArray)
+    {
+
+        Vector result = new Vector();
+        for (int i = 0; i < theFirstArray.length; i++)
+        {
+            result.add(theFirstArray[i]);
+        }
+        for (int i = 0; i < theSecondArray.length; i++)
+        {
+            IClasspathEntry currentEntry = theSecondArray[i];
+            String currentEntryFileName = currentEntry.getPath().toFile().getName();
+            boolean entryAlreadyExists = false;
+            boolean isFile = false;
+            for (int j = 0; j < theFirstArray.length; j++)
+            {
+                IClasspathEntry comparedEntry = theFirstArray[j];
+                isFile = comparedEntry.getPath().toFile().getAbsolutePath().endsWith(".jar");
+                String comparedFileName = comparedEntry.getPath().toFile().getName();
+                if (comparedEntry.getPath().equals(currentEntry.getPath()) || (comparedFileName.equals(currentEntryFileName) && isFile))
+                {
+                    entryAlreadyExists = true;
+                    break;
+                }
+            }
+            if (!entryAlreadyExists)
+            {
+                result.add(currentEntry);
+            }
+        }
+        return (IClasspathEntry[]) result.toArray(
+            new IClasspathEntry[result.size()]);
+    }
+
+	public void setSelectedProject(IJavaProject selectedProject) {
+		this.selectedProject = selectedProject;
+	}
+}

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactifyActionDelegate.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusMessages.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusMessages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusPlugin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusPreferencePage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/CactusPreferences.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/java/org/apache/cactus/eclipse/runner/ui/ContainersPreferencePage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.runner/src/main/resources/org/apache/cactus/eclipse/runner/ui/CactusMessages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-src.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-src.xml?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-src.xml (original)
+++ jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-src.xml Fri Mar 28 16:39:13 2008
@@ -1,14 +1,14 @@
-<assembly>
-  <id>src</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/java/</directory>
-      <useDefaultExcludes>true</useDefaultExcludes>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
+<assembly>
+  <id>src</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>src/main/java/</directory>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/assemble/main-src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/conf/plugin.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/conf/plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/main/java/org/apache/cactus/eclipse/webapp/internal/WarBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/main/java/org/apache/cactus/eclipse/webapp/internal/Webapp.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/main/java/org/apache/cactus/eclipse/webapp/internal/ui/WebAppConfigurationBlock.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/main/java/org/apache/cactus/eclipse/webapp/internal/ui/WebAppPropertyPage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/main/java/org/apache/cactus/eclipse/webapp/internal/ui/WebappMessages.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/main/java/org/apache/cactus/eclipse/webapp/internal/ui/WebappMessages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/main/java/org/apache/cactus/eclipse/webapp/internal/ui/WebappPlugin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/org.apache.cactus.eclipse.webapp/src/main/resources/org/apache/cactus/eclipse/webapp/internal/ui/WebappMessages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/eclipse/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/plugin.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/main/java/org/apache/cactus/integration/maven/CactusScanner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/main/java/org/apache/cactus/integration/maven/CactusScannerTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/main/java/org/apache/cactus/integration/maven/CactusTagLibrary.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-resources/jboss3x/jboss-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-resources/jboss3x/roles.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-resources/jboss3x/users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testBundleProperties/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testBundleProperties/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testBundleProperties/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/src/test-cactus/org/apache/cactus/integration/maven/test/TestProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusSysProperties/src/web/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusTestSkip/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusTestSkip/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusTestSkip/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusTestSkip/src/test/org/apache/cactus/integration/maven/test/PropertiesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusWarEarProperties/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusWarEarProperties/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusWarEarProperties/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCactusWarEarProperties/src/web/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCustomWarName/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCustomWarName/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCustomWarName/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testCustomWarName/src/web/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/src/conf/properties/recursiveResources/test-recursive.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/src/conf/properties/test.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/src/conf/properties/testKO.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/src/conf/properties/testbad.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/src/conf/xml/recursiveResources/test-recursive-default.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/src/conf/xml/test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/src/test-cactus/org/apache/integration/maven/test/TestResources.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testIncludeResources/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testMultipleSrcDir/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testMultipleSrcDir/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testMultipleSrcDir/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testMultipleSrcDir/src/test-2/org/apache/cactus/integration/maven/test/Super2Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testMultipleSrcDir/src/test-3/org/apache/cactus/integration/maven/test/Super3Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testMultipleSrcDir/src/test/org/apache/cactus/integration/maven/test/Sub2Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testMultipleSrcDir/src/test/org/apache/cactus/integration/maven/test/Sub3Test.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSimpleWar/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSimpleWar/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSimpleWar/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSimpleWar/src/web/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSimpleWarNoWebXml/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSimpleWarNoWebXml/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSkipPropertyEar/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSkipPropertyEar/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSkipPropertyEar/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSkipPropertyWar/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSkipPropertyWar/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven/src/plugin-test/testSkipPropertyWar/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/maven2/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/shared-api/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/FilterRedirector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/JspRedirector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/Redirector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/cactify/ServletRedirector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/integration/shared-api/src/main/java/org/apache/cactus/integration/api/version/Version.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jakarta/cactus/trunk/samples/build.properties
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/build.properties?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/build.properties (original)
+++ jakarta/cactus/trunk/samples/build.properties Fri Mar 28 16:39:13 2008
@@ -1,40 +1,40 @@
-#Here comes the directory properties.
-basedir=.
-target.dir=${basedir}/target
-build.dir=${target.dir}/classes
-cactus.build.dir=${target.dir}/cactus/
-cactus.src.dir=${basedir}/src/main/cactus/
-src.dir=${basedir}/src/main/java/
-src.application.dir=${basedir}/src/main/app
-meta.inf.dir=${basedir}/src/main/resources
-src.webapp.dir=${basedir}/src/main/webapp
-
-src.conf.dir=${basedir}/src/main/resources/conf/
-
-#Project Specific Settings
-#cactus.samples.servlet-1.8.0-SNAPSHOT.war
-
-servlet.project.name=samples-servlet-1.8.0-SNAPSHOT
-ejb.project.name=samples-ejb-1.8.0-SNAPSHOT
-
-servlet.archive.name=${target.dir}/${servlet.project.name}.${cactus.sample.archive.type}
-ejb.archive.name=${target.dir}/${ejb.project.name}.${cactus.sample.archive.type}
-
-cactified.servlet.archive.name=${target.dir}/${servlet.project.name}-cactified.${cactus.sample.archive.type}
-cactified.ejb.archive.name=${target.dir}/${ejb.project.name}-cactified.${cactus.sample.archive.type}
-
-#Maven Repository
-maven.repo=/home/peter/.m2/repository/
-
-
-#Container settings
-tomcat.container.id=tomcat5x
-jboss.container.id=jboss4x
-logs.dir=${target.dir}/logs
-cactus.formatter.type=xml
-cargo.servlet.port=8080
-cargo.logging=high
-reports.dir=${basedir}/target/reports
-
-#Ivy properties
-ivy.lib.dir=${basedir}/target/lib
+#Here comes the directory properties.
+basedir=.
+target.dir=${basedir}/target
+build.dir=${target.dir}/classes
+cactus.build.dir=${target.dir}/cactus/
+cactus.src.dir=${basedir}/src/main/cactus/
+src.dir=${basedir}/src/main/java/
+src.application.dir=${basedir}/src/main/app
+meta.inf.dir=${basedir}/src/main/resources
+src.webapp.dir=${basedir}/src/main/webapp
+
+src.conf.dir=${basedir}/src/main/resources/conf/
+
+#Project Specific Settings
+#cactus.samples.servlet-1.8.0-SNAPSHOT.war
+
+servlet.project.name=samples-servlet-1.8.0-SNAPSHOT
+ejb.project.name=samples-ejb-1.8.0-SNAPSHOT
+
+servlet.archive.name=${target.dir}/${servlet.project.name}.${cactus.sample.archive.type}
+ejb.archive.name=${target.dir}/${ejb.project.name}.${cactus.sample.archive.type}
+
+cactified.servlet.archive.name=${target.dir}/${servlet.project.name}-cactified.${cactus.sample.archive.type}
+cactified.ejb.archive.name=${target.dir}/${ejb.project.name}-cactified.${cactus.sample.archive.type}
+
+#Maven Repository
+maven.repo=/home/peter/.m2/repository/
+
+
+#Container settings
+tomcat.container.id=tomcat5x
+jboss.container.id=jboss4x
+logs.dir=${target.dir}/logs
+cactus.formatter.type=xml
+cargo.servlet.port=8080
+cargo.logging=high
+reports.dir=${basedir}/target/reports
+
+#Ivy properties
+ivy.lib.dir=${basedir}/target/lib

Propchange: jakarta/cactus/trunk/samples/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/app/application.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/Converter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/ConverterEJB.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/ConverterHome.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/java/org/apache/cactus/sample/ejb/TestConverterEJB.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/resources/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/resources/ejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/cactus-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ejb/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jakarta/cactus/trunk/samples/ivysettings.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/ivysettings.xml?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/ivysettings.xml (original)
+++ jakarta/cactus/trunk/samples/ivysettings.xml Fri Mar 28 16:39:13 2008
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
-<settings defaultResolver="local-maven2">
-        <property name="local-maven2-pattern" value="file:${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision].[ext]"
-        override="true" />
-        <resolvers>
-                <url name="local-maven2" m2compatible="true">
-                        <artifact pattern="${local-maven2-pattern}"/>
-                </url>
-        </resolvers>
-</settings>
+<?xml version="1.0"?>
+<settings defaultResolver="local-maven2">
+        <property name="local-maven2-pattern" value="file:${user.home}/.m2/repository/[organisation]/[module]/[revision]/[module]-[revision].[ext]"
+        override="true" />
+        <resolvers>
+                <url name="local-maven2" m2compatible="true">
+                        <artifact pattern="${local-maven2-pattern}"/>
+                </url>
+        </resolvers>
+</settings>

Propchange: jakarta/cactus/trunk/samples/ivysettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jakarta/cactus/trunk/samples/jetty/build.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/build.xml?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/build.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/build.xml Fri Mar 28 16:39:13 2008
@@ -1,200 +1,200 @@
-<?xml version="1.0"?>
-
-<!--
-  =============================================================================
-    Build file for the Cactus Jetty Sample subproject (it shows how to use
-    Cactus and Jelly in an integrated way for unit testing the Servlet API : 
-    Servlets, Fitlers, Taglibs).
-
-    The following Ant tasks need to be available in your ant installation (i.e.
-    the Ant task themselves and their dependent jars need to be put in
-    ANT_HOME/lib) :
-
-        junit                  [REQUIRED] JUnit Ant task
-
-    The mandatory and optional Ant properties are defined in
-    build.properties.sample. Please read and edit that file.
-
-    This script should be started with the following command line :
-
-        ant <target>
-
-    Run "ant -projecthelp" to get a list of available targets. The default
-    target is "dist"
-  =============================================================================
--->
-<project name="Cactus Jetty Sample" xmlns:ivy="antlib:org.apache.ivy.ant" default="test">
-
-  <description>
-     Cactus Jetty Sample
-     ---------------------------------------------------------
-     Sample web-application that demonstrates how Cactus can
-     be used using the Jetty integration for unit testing 
-     classes that use the servlet API (such as servlets, 
-     filters and tag libraries).
-  </description>
-
- <!--
-     ========================================================================
-       Initialize properties.
-     ========================================================================
-  -->	
-  <target name="init" depends="">
-  
-	  <property name="cactus.sample.app.type" value="servlet"/>
-		<property name="cactus.sample.archive.type" value="war"/>
-    <property environment="env"/>
-    <property file="../build.properties"/>
-	 
-	
-		<path id="cactus.classpath">
-			<fileset dir="${ivy.lib.dir}">
-        <include name="*.jar"/>
-      </fileset>
-      <dirset dir="../servlet/target/">
-        <include name="classes"/>
-      </dirset>
-		</path>
-		
-  </target>
-  
-<!--
-     ========================================================================
-       Prepare the folder structure.
-     ========================================================================
-  -->
-	<target name="prepare" depends="init">
-		<mkdir dir="${build.dir}"/>
-		<mkdir dir="${logs.dir}"/>
-		<mkdir dir="${reports.dir}"/>
-	</target>
-
-<!--
-     ========================================================================
-       Resolve Ivy dependencies.
-     ========================================================================
-  -->
-	<target name="resolve" description="Retrieve dependencies with ivy" depends="prepare">
-		<ivy:configure file="../ivysettings.xml" />
-		<ivy:retrieve file="../ivy.xml" sync="true"/>
-  </target>
-
-<!--
-     ========================================================================
-       Load external ant tasks.
-     ========================================================================
-  -->
-	<target name="load.tasks" depends="resolve">
-		<taskdef resource="cactus.tasks"
-			 classpathref="cactus.classpath">
-		</taskdef>
-	</target>
-
-
-
-<!--
-     ========================================================================
-       Compile source classes as well as cactus classes.
-     ========================================================================
-  -->
-	<!--Note that if some dependency is missing in the classpath, instead of compilation errors,
-      Ivy reports to Maven 'No Compiler Found' error. -->
-	<target name="compile" depends="load.tasks">
-		
-		<javac srcdir="${src.dir}"
-		       destdir="${build.dir}"
-		       classpathref="cactus.classpath"/>
-		
-		<javac srcdir="${cactus.src.dir}"
-		       destdir="${build.dir}"
-			     classpathref="cactus.classpath"/>
-		<javac srcdir="${src.webapp.dir}"
-		       destdir="${build.dir}"
-			     classpathref="cactus.classpath"/>
-	</target>
-
-  <!--
-     ========================================================================
-       Create the runtime war file.
-     ========================================================================
-  -->
-	<target name="package-war" depends="compile">
-		<war destfile="${servlet.archive.name}" webxml="${basedir}/src/main/webapp/WEB-INF/web.xml">
-		  <fileset dir="${basedir}/src/main/webapp/WEB-INF">
-        <exclude name="cactus-report.xsl"/>
-        <exclude name="cactus-web.xml"/>
-        <exclude name="web.xml"/>
-      </fileset>
-      <fileset dir="${basedir}/src/main/webapp">
-        <include name="test/test.jsp"/>
-        <include name="org/apache/jsp/jspRedirector.jsp"/>
-      </fileset>
-			<classes dir="${build.dir}"/>
-			<lib dir="${ivy.lib.dir}">
-				<include name="**.jar"/>
-				<exclude name="jsp-api-2.0.jar"/>
-        <exclude name="servlet-api-2.5.jar"/>
-			</lib>	
-		</war>
-	</target>
-
-
-  <!--
-     ========================================================================
-       Generate the distributable files
-     ========================================================================
-  -->
-  <target name="dist" depends="clean, package-war, test"
-      description="Generate the distributable files">
-
-    <copy todir="${dist.dir}"
-        file="${target.dir}/${project.name.file}.war"/>
-
-  </target>
-
-  <!--
-     ========================================================================
-       Clean generated files (including distributables)
-     ========================================================================
-  -->
-  <target name="clean" depends="init" description="Clean all generated files">
-
-    <delete dir="${target.dir}"/>
-    <delete dir="${dist.dir}"/>
-
-  </target>
-
-<!--
-     ========================================================================
-       Run the tests on Jetty.
-     ========================================================================
-  -->
-  <target name="test" depends="compile">
-    
-    <junit fork="yes" failureproperty="tests.failed">
-      <sysproperty key="cactus.contextURL"
-          value="http://localhost:${cargo.servlet.port}/test"/>
-      <sysproperty key="cactus.jetty.resourceDir" file="${src.webapp.dir}"/>
-      <sysproperty key="cactus.jetty.config" file="${src.conf.dir}/5x/jetty.xml"/>
-      <classpath>
-        <path refid="cactus.classpath"/>
-        <pathelement location="${build.dir}"/>
-        <!-- Needed By Jasper to Compile the JSPs-->
-        <pathelement location="${env.JAVA_HOME}\lib\tools.jar"/>
-      </classpath>
-      <formatter type="brief" usefile="false"/>
-      <formatter type="xml"/>
-      <test todir="${reports.dir}"
-          name="org.apache.cactus.sample.jetty.TestJettyAll"/>
-    </junit>
-
-    <junitreport todir="${reports.dir}">
-      <fileset dir="${reports.dir}" includes="TEST-*.xml"/>
-      <report todir="${reports.dir}" format="frames"/>
-    </junitreport>
-
-    <fail if="tests.failed">At least one test failed!</fail>
-
-  </target>
-
-</project>
+<?xml version="1.0"?>
+
+<!--
+  =============================================================================
+    Build file for the Cactus Jetty Sample subproject (it shows how to use
+    Cactus and Jelly in an integrated way for unit testing the Servlet API : 
+    Servlets, Fitlers, Taglibs).
+
+    The following Ant tasks need to be available in your ant installation (i.e.
+    the Ant task themselves and their dependent jars need to be put in
+    ANT_HOME/lib) :
+
+        junit                  [REQUIRED] JUnit Ant task
+
+    The mandatory and optional Ant properties are defined in
+    build.properties.sample. Please read and edit that file.
+
+    This script should be started with the following command line :
+
+        ant <target>
+
+    Run "ant -projecthelp" to get a list of available targets. The default
+    target is "dist"
+  =============================================================================
+-->
+<project name="Cactus Jetty Sample" xmlns:ivy="antlib:org.apache.ivy.ant" default="test">
+
+  <description>
+     Cactus Jetty Sample
+     ---------------------------------------------------------
+     Sample web-application that demonstrates how Cactus can
+     be used using the Jetty integration for unit testing 
+     classes that use the servlet API (such as servlets, 
+     filters and tag libraries).
+  </description>
+
+ <!--
+     ========================================================================
+       Initialize properties.
+     ========================================================================
+  -->	
+  <target name="init" depends="">
+  
+	  <property name="cactus.sample.app.type" value="servlet"/>
+		<property name="cactus.sample.archive.type" value="war"/>
+    <property environment="env"/>
+    <property file="../build.properties"/>
+	 
+	
+		<path id="cactus.classpath">
+			<fileset dir="${ivy.lib.dir}">
+        <include name="*.jar"/>
+      </fileset>
+      <dirset dir="../servlet/target/">
+        <include name="classes"/>
+      </dirset>
+		</path>
+		
+  </target>
+  
+<!--
+     ========================================================================
+       Prepare the folder structure.
+     ========================================================================
+  -->
+	<target name="prepare" depends="init">
+		<mkdir dir="${build.dir}"/>
+		<mkdir dir="${logs.dir}"/>
+		<mkdir dir="${reports.dir}"/>
+	</target>
+
+<!--
+     ========================================================================
+       Resolve Ivy dependencies.
+     ========================================================================
+  -->
+	<target name="resolve" description="Retrieve dependencies with ivy" depends="prepare">
+		<ivy:configure file="../ivysettings.xml" />
+		<ivy:retrieve file="../ivy.xml" sync="true"/>
+  </target>
+
+<!--
+     ========================================================================
+       Load external ant tasks.
+     ========================================================================
+  -->
+	<target name="load.tasks" depends="resolve">
+		<taskdef resource="cactus.tasks"
+			 classpathref="cactus.classpath">
+		</taskdef>
+	</target>
+
+
+
+<!--
+     ========================================================================
+       Compile source classes as well as cactus classes.
+     ========================================================================
+  -->
+	<!--Note that if some dependency is missing in the classpath, instead of compilation errors,
+      Ivy reports to Maven 'No Compiler Found' error. -->
+	<target name="compile" depends="load.tasks">
+		
+		<javac srcdir="${src.dir}"
+		       destdir="${build.dir}"
+		       classpathref="cactus.classpath"/>
+		
+		<javac srcdir="${cactus.src.dir}"
+		       destdir="${build.dir}"
+			     classpathref="cactus.classpath"/>
+		<javac srcdir="${src.webapp.dir}"
+		       destdir="${build.dir}"
+			     classpathref="cactus.classpath"/>
+	</target>
+
+  <!--
+     ========================================================================
+       Create the runtime war file.
+     ========================================================================
+  -->
+	<target name="package-war" depends="compile">
+		<war destfile="${servlet.archive.name}" webxml="${basedir}/src/main/webapp/WEB-INF/web.xml">
+		  <fileset dir="${basedir}/src/main/webapp/WEB-INF">
+        <exclude name="cactus-report.xsl"/>
+        <exclude name="cactus-web.xml"/>
+        <exclude name="web.xml"/>
+      </fileset>
+      <fileset dir="${basedir}/src/main/webapp">
+        <include name="test/test.jsp"/>
+        <include name="org/apache/jsp/jspRedirector.jsp"/>
+      </fileset>
+			<classes dir="${build.dir}"/>
+			<lib dir="${ivy.lib.dir}">
+				<include name="**.jar"/>
+				<exclude name="jsp-api-2.0.jar"/>
+        <exclude name="servlet-api-2.5.jar"/>
+			</lib>	
+		</war>
+	</target>
+
+
+  <!--
+     ========================================================================
+       Generate the distributable files
+     ========================================================================
+  -->
+  <target name="dist" depends="clean, package-war, test"
+      description="Generate the distributable files">
+
+    <copy todir="${dist.dir}"
+        file="${target.dir}/${project.name.file}.war"/>
+
+  </target>
+
+  <!--
+     ========================================================================
+       Clean generated files (including distributables)
+     ========================================================================
+  -->
+  <target name="clean" depends="init" description="Clean all generated files">
+
+    <delete dir="${target.dir}"/>
+    <delete dir="${dist.dir}"/>
+
+  </target>
+
+<!--
+     ========================================================================
+       Run the tests on Jetty.
+     ========================================================================
+  -->
+  <target name="test" depends="compile">
+    
+    <junit fork="yes" failureproperty="tests.failed">
+      <sysproperty key="cactus.contextURL"
+          value="http://localhost:${cargo.servlet.port}/test"/>
+      <sysproperty key="cactus.jetty.resourceDir" file="${src.webapp.dir}"/>
+      <sysproperty key="cactus.jetty.config" file="${src.conf.dir}/5x/jetty.xml"/>
+      <classpath>
+        <path refid="cactus.classpath"/>
+        <pathelement location="${build.dir}"/>
+        <!-- Needed By Jasper to Compile the JSPs-->
+        <pathelement location="${env.JAVA_HOME}\lib\tools.jar"/>
+      </classpath>
+      <formatter type="brief" usefile="false"/>
+      <formatter type="xml"/>
+      <test todir="${reports.dir}"
+          name="org.apache.cactus.sample.jetty.TestJettyAll"/>
+    </junit>
+
+    <junitreport todir="${reports.dir}">
+      <fileset dir="${reports.dir}" includes="TEST-*.xml"/>
+      <report todir="${reports.dir}" format="frames"/>
+    </junitreport>
+
+    <fail if="tests.failed">At least one test failed!</fail>
+
+  </target>
+
+</project>

Propchange: jakarta/cactus/trunk/samples/jetty/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jakarta/cactus/trunk/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java (original)
+++ jakarta/cactus/trunk/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java Fri Mar 28 16:39:13 2008
@@ -1,58 +1,58 @@
-/* 
- * ========================================================================
- * 
- * Copyright 2001-2003 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.
- * 
- * ========================================================================
- */
-package org.apache.cactus.sample.jetty;
-
-import org.apache.cactus.extension.jetty.JettyTestSetup;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Run all tests inside the Jetty container.
- *
- * @version $Id: TestJettyAll.java 238816 2004-02-29 16:36:46Z vmassol $
- */
-public class TestJettyAll extends TestCase
-{
-    /**
-     * @return a <code>JettyTestSetup</code> test suite that wraps all our
-     *         tests so that Jetty will be started before the tests execute
-     */
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite(
-            "Cactus unit tests executing in Jetty");
-
-        // Functional tests
-         suite.addTestSuite(
-             org.apache.cactus.sample.servlet.TestSampleServlet.class);
-         suite.addTestSuite(
-             org.apache.cactus.sample.servlet.TestSampleServletConfig.class);
-         suite.addTestSuite(
-             org.apache.cactus.sample.servlet.TestSampleTag.class);
-         suite.addTestSuite(
-             org.apache.cactus.sample.servlet.TestSampleBodyTag.class);
-         suite.addTestSuite(
-             org.apache.cactus.sample.servlet.TestSampleFilter.class);
-
-        return new JettyTestSetup(suite);
-    }
-}
+/* 
+ * ========================================================================
+ * 
+ * Copyright 2001-2003 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.
+ * 
+ * ========================================================================
+ */
+package org.apache.cactus.sample.jetty;
+
+import org.apache.cactus.extension.jetty.JettyTestSetup;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Run all tests inside the Jetty container.
+ *
+ * @version $Id: TestJettyAll.java 238816 2004-02-29 16:36:46Z vmassol $
+ */
+public class TestJettyAll extends TestCase
+{
+    /**
+     * @return a <code>JettyTestSetup</code> test suite that wraps all our
+     *         tests so that Jetty will be started before the tests execute
+     */
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite(
+            "Cactus unit tests executing in Jetty");
+
+        // Functional tests
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleServlet.class);
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleServletConfig.class);
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleTag.class);
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleBodyTag.class);
+         suite.addTestSuite(
+             org.apache.cactus.sample.servlet.TestSampleFilter.class);
+
+        return new JettyTestSetup(suite);
+    }
+}

Propchange: jakarta/cactus/trunk/samples/jetty/src/main/cactus/org/apache/cactus/sample/jetty/TestJettyAll.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jakarta/cactus/trunk/samples/jetty/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/samples/jetty/src/main/webapp/WEB-INF/web.xml?rev=642435&r1=642434&r2=642435&view=diff
==============================================================================
--- jakarta/cactus/trunk/samples/jetty/src/main/webapp/WEB-INF/web.xml (original)
+++ jakarta/cactus/trunk/samples/jetty/src/main/webapp/WEB-INF/web.xml Fri Mar 28 16:39:13 2008
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-
-<web-app>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>SecurityRestriction</web-resource-name>
-      <description>Protect the Cactus redirector servlet.</description>
-      <url-pattern>/ServletRedirectorSecure</url-pattern>
-      <http-method>GET</http-method>
-      <http-method>POST</http-method>
-    </web-resource-collection>
-    <auth-constraint>
-      <description>Authorized Users Group</description>
-      <role-name>test</role-name>
-    </auth-constraint>
-    <user-data-constraint>
-      <transport-guarantee>NONE</transport-guarantee>
-    </user-data-constraint>
-  </security-constraint>
-
-  <login-config>
-    <auth-method>BASIC</auth-method>
-    <realm-name>Sample Cactus Servlet Application</realm-name>
-  </login-config>
-
-  <security-role>
-    <description>Test role</description>
-    <role-name>test</role-name>
-  </security-role>
-
-</web-app>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+    "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
+
+<web-app>
+
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>SecurityRestriction</web-resource-name>
+      <description>Protect the Cactus redirector servlet.</description>
+      <url-pattern>/ServletRedirectorSecure</url-pattern>
+      <http-method>GET</http-method>
+      <http-method>POST</http-method>
+    </web-resource-collection>
+    <auth-constraint>
+      <description>Authorized Users Group</description>
+      <role-name>test</role-name>
+    </auth-constraint>
+    <user-data-constraint>
+      <transport-guarantee>NONE</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+
+  <login-config>
+    <auth-method>BASIC</auth-method>
+    <realm-name>Sample Cactus Servlet Application</realm-name>
+  </login-config>
+
+  <security-role>
+    <description>Test role</description>
+    <role-name>test</role-name>
+  </security-role>
+
+</web-app>

Propchange: jakarta/cactus/trunk/samples/jetty/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/integration/maven/test/TestProperties.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/TestSampleBodyTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/TestSampleFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/TestSampleServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/TestSampleServletConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/TestSampleTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestAll.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestBasicAuthentication.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestClientServerSynchronization.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestCookie.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestFilterHttpHeaders.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestGlobalBeginEnd.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHtmlUnitIntegration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHttpHeaders.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHttpParameters.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHttpRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHttpRequestSpecific.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHttpResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHttpSession.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestHttpUnitIntegration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestJUnitTestCaseWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestJspOut.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestJspPageContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestJspTagLifecycle.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestRequestDispatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestServerSideExceptions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestServletConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestServletContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestServletRedirectorOverride.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestSetURL.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestSetURLSpecific.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestSetUpTearDown.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestShareAll.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/cactus/org/apache/cactus/sample/servlet/unit/TestTearDownException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/SampleBodyTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/SampleFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/SampleServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/SampleServletConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/SampleTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/TestSampleBodyTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/TestSampleFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/TestSampleServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/TestSampleServletConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/TestSampleTag.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestAll.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestBasicAuthentication.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestClientServerSynchronization.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestCookie.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestFilterHttpHeaders.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestGlobalBeginEnd.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestHtmlUnitIntegration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestHttpHeaders.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestHttpParameters.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestHttpRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestHttpRequestSpecific.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestHttpResponse.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestHttpSession.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestHttpUnitIntegration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestJUnitTestCaseWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestJspOut.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestJspPageContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestJspTagLifecycle.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestRequestDispatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestServerSideExceptions.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestServletConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestServletContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestServletRedirectorOverride.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestSetURL.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestSetURLSpecific.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestSetUpTearDown.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestShareAll.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/unit/TestTearDownException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/util/FilterServletOutputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/java/org/apache/cactus/sample/servlet/util/GenericResponseWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/resources/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/resources/conf/jboss3x/jboss-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/resources/conf/jboss3x/roles.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/resources/conf/jboss3x/users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/resources/conf/logging_client.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/resources/conf/logging_server.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/resources/scripts/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/webapp/WEB-INF/cactus-report.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/webapp/WEB-INF/cactus-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/samples/servlet/src/main/webapp/cactus-report.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/scratchpad/TestCactus/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/cactus/trunk/scratchpad/TestCactus/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org