cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r158725 [1/4] - in cocoon/branches/BRANCH_2_1_X/src/blocks: forms/java/org/apache/cocoon/forms/samples/dreamteam/ forms/samples/dreamteam/content/ forms/samples/dreamteam/flow/ forms/samples/dreamteam/messages/ forms/samples/dreamteam/resources/styles/ jms/conf/ jms/java/org/apache/cocoon/acting/ jms/java/org/apache/cocoon/components/jms/
Date Wed, 23 Mar 2005 04:01:12 GMT
Author: crossley
Date: Tue Mar 22 20:01:09 2005
New Revision: 158725

URL: http://svn.apache.org/viewcvs?view=rev&rev=158725
Log:
dos2unix

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/showTeam.jx
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/soccer.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/teamTemplate.jx
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/flow/team.js
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/messages/DreamTeamMessages.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/messages/DreamTeamMessages_de.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/messages/DreamTeamMessages_it.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/messages/FormsMessages.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/messages/FormsMessages_nl_NL.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/resources/styles/dreamteam.css
    cocoon/branches/BRANCH_2_1_X/src/blocks/jms/conf/jms-connection-manager.xconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/jms/conf/jms-connection-manager.xroles
    cocoon/branches/BRANCH_2_1_X/src/blocks/jms/java/org/apache/cocoon/acting/JMSPublisherAction.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/jms/java/org/apache/cocoon/components/jms/AbstractMessageListener.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/jms/java/org/apache/cocoon/components/jms/AbstractMessagePublisher.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnectionManager.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/jms/java/org/apache/cocoon/components/jms/JMSConnectionManagerImpl.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java?view=diff&r1=158724&r2=158725
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/Team.java
Tue Mar 22 20:01:09 2005
@@ -1,57 +1,57 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.forms.samples.dreamteam;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * Team
- */
-public class Team {
-
-    private Collection team = new ArrayList();
-
-    public Team() {
-    }
-
-    public Collection getTeam() {
-        return team;
-    }
-
-    public void setTeam(Collection _team) {
-        team = _team;
-    }
-
-    public void addMember(TeamMember member) {
-        team.add(member);
-    }
-
-    public TeamMember getMember(String memberID) {
-        TeamMember member = null;
-        if (team == null) {
-            return null;
-        }
-        for (Iterator iter = team.iterator(); iter.hasNext();) {
-            member = (TeamMember) iter.next();
-            if (member.getMemberId().equals(memberID)) {
-                return member;
-            }
-        }
-        return null;
-    }
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.forms.samples.dreamteam;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * Team
+ */
+public class Team {
+
+    private Collection team = new ArrayList();
+
+    public Team() {
+    }
+
+    public Collection getTeam() {
+        return team;
+    }
+
+    public void setTeam(Collection _team) {
+        team = _team;
+    }
+
+    public void addMember(TeamMember member) {
+        team.add(member);
+    }
+
+    public TeamMember getMember(String memberID) {
+        TeamMember member = null;
+        if (team == null) {
+            return null;
+        }
+        for (Iterator iter = team.iterator(); iter.hasNext();) {
+            member = (TeamMember) iter.next();
+            if (member.getMemberId().equals(memberID)) {
+                return member;
+            }
+        }
+        return null;
+    }
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java?view=diff&r1=158724&r2=158725
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
Tue Mar 22 20:01:09 2005
@@ -1,81 +1,81 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.forms.samples.dreamteam;
-
-/**
- * TeamMember
- */
-public class TeamMember {
-    private String memberId = null;
-    private String name = null;
-    private String position = null;
-    private String country = null;
-
-    public TeamMember() {
-        super();
-    }
-
-    public String getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(String memberID) {
-        this.memberId = memberID;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getLastName() {
-        if (name == null) {
-            return "Name not set!";
-        }
-        String lastName = name.substring(name.indexOf(" ") + 1);
-        if (lastName.equals("")) {
-            lastName = name;
-        }
-        return lastName;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String profession) {
-        this.position = profession;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String toString() {
-        String result = "<member id='" + memberId + "'><name>" + name
-                + "</name><position>" + position + "</position><country>"
-                + country + "</country></member>";
-        return result;
-    }
-
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.forms.samples.dreamteam;
+
+/**
+ * TeamMember
+ */
+public class TeamMember {
+    private String memberId = null;
+    private String name = null;
+    private String position = null;
+    private String country = null;
+
+    public TeamMember() {
+        super();
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberID) {
+        this.memberId = memberID;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getLastName() {
+        if (name == null) {
+            return "Name not set!";
+        }
+        String lastName = name.substring(name.indexOf(" ") + 1);
+        if (lastName.equals("")) {
+            lastName = name;
+        }
+        return lastName;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String profession) {
+        this.position = profession;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String toString() {
+        String result = "<member id='" + memberId + "'><name>" + name
+                + "</name><position>" + position + "</position><country>"
+                + country + "</country></member>";
+        return result;
+    }
+
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/showTeam.jx
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/showTeam.jx?view=diff&r1=158724&r2=158725
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/showTeam.jx (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/forms/samples/dreamteam/content/showTeam.jx Tue
Mar 22 20:01:09 2005
@@ -13,12 +13,12 @@
   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.
--->
-<jx:template xmlns:jx="http://apache.org/cocoon/templates/jx/1.0" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-      <link href="local-resources/dreamteam.css" type="text/css" rel="stylesheet"/>
+-->
+<jx:template xmlns:jx="http://apache.org/cocoon/templates/jx/1.0" xmlns:i18n="http://apache.org/cocoon/i18n/2.1">
+  <html>
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+      <link href="local-resources/dreamteam.css" type="text/css" rel="stylesheet"/>
       <!--
          The Sortable Table script from WebFX (http://webfx.eae.net/) has
          no Apache compatible license and can therefore not be added to
@@ -26,76 +26,76 @@
          If you want to use the adjusted version of the Sortable Table
          email Helma van der Linden (hepabolu@gmail.com) and
          uncomment the line below
-        -->
-      <!-- <script type="text/javascript" src="resources/sortabletable.js"></script>
-->
-      <title>Your Dream Team</title>
-    </head>
-    <body>
-      <h1>Your Dream Team</h1>
-      <p>And here is your dream team. May the best team win!</p>
+        -->
+      <!-- <script type="text/javascript" src="resources/sortabletable.js"></script>
-->
+      <title>Your Dream Team</title>
+    </head>
+    <body>
+      <h1>Your Dream Team</h1>
+      <p>And here is your dream team. May the best team win!</p>
       <!--
              uncomment the lines below if you want to use the
              adjusted version of the SortableTable script
-          -->
+          -->
       <!--
         <p>If you click on a table header, the table will be sorted for
            that column. Click again and the sort will be reversed.</p>
-        -->
-      <table id="sortTable1">
-        <thead>
-          <tr>
-            <td class="tableheader">Name</td>
-            <td class="tableheader">Position</td>
-            <td class="tableheader">Country</td>
-            <td class="tableheader">&#160;</td>
-          </tr>
-        </thead>
-        <tbody>
-          <jx:choose>
-            <jx:when test="size &lt; 1">
-              <tr>
-                <td colspan="4" align="center">
-                  <strong>No team selected</strong>
-                </td>
-              </tr>
-            </jx:when>
-            <jx:otherwise>
-              <jx:forEach var="person" items="${list.getTeam()}">
-                <jx:set var="name" value="${person.getName()}"/>
-                <jx:set var="lastname" value="${person.getLastName()}"/>
-                <jx:set var="position" value="${person.getPosition()}"/>
-                <jx:set var="country" value="${person.getCountry()}"/>
-                <tr>
-                  <td>${name}</td>
-                  <td>
-                    <i18n:text>${position}</i18n:text>
-                  </td>
-                  <td>
-                    <img src="flags/${country}.gif"/>
-                  </td>
-                  <td>
-                    <i18n:text>${country}</i18n:text>
-                  </td>
+        -->
+      <table id="sortTable1">
+        <thead>
+          <tr>
+            <td class="tableheader">Name</td>
+            <td class="tableheader">Position</td>
+            <td class="tableheader">Country</td>
+            <td class="tableheader">&#160;</td>
+          </tr>
+        </thead>
+        <tbody>
+          <jx:choose>
+            <jx:when test="size &lt; 1">
+              <tr>
+                <td colspan="4" align="center">
+                  <strong>No team selected</strong>
+                </td>
+              </tr>
+            </jx:when>
+            <jx:otherwise>
+              <jx:forEach var="person" items="${list.getTeam()}">
+                <jx:set var="name" value="${person.getName()}"/>
+                <jx:set var="lastname" value="${person.getLastName()}"/>
+                <jx:set var="position" value="${person.getPosition()}"/>
+                <jx:set var="country" value="${person.getCountry()}"/>
+                <tr>
+                  <td>${name}</td>
+                  <td>
+                    <i18n:text>${position}</i18n:text>
+                  </td>
+                  <td>
+                    <img src="flags/${country}.gif"/>
+                  </td>
+                  <td>
+                    <i18n:text>${country}</i18n:text>
+                  </td>
                   <!--
                      replace the lines above with the lines below if you
                      want to use the adjusted Sortable Table script.
-                  -->
+                  -->
                   <!--
                     <td sort="${lastname}">${name}</td>
                     <td sort="${position}"><i18n:text>${position}</i18n:text></td>
                     <td sort="${country}"><img src="flags/${country}.gif"/></td>
                     <td><i18n:text>${country}</i18n:text></td>
-                  -->
-                </tr>
-              </jx:forEach>
-            </jx:otherwise>
-          </jx:choose>
-        </tbody>
-      </table>
+                  -->
+                </tr>
+              </jx:forEach>
+            </jx:otherwise>
+          </jx:choose>
+        </tbody>
+      </table>
       <!--
              uncomment the lines below if you want to use the
              adjusted version of the SortableTable script
-         -->
+         -->
       <!--
         <script type="text/javascript">
             var st1 = new SortableTable(document.getElementById("sortTable1"),
@@ -108,14 +108,14 @@
             st1.sort(initSortCol);
             st1.updateHeaderArrows();
         </script>
-        -->
-      <p class="developer-header"> Developer Notes </p>
-      <p class="developer-note"> This is the last page of the sample. It is built by
the <i>prot_showTeam</i> function
-        in <b>team.js</b>. It takes the dream team list, stored in the Manager
class and adds it to the JXTemplate for
-        display. </p>
-      <p class="developer-note"> This page also uses some i18n tags to show words rather
than codes (for positions and
-        countries). </p>
-      <h2>Do study the code</h2>
-    </body>
-  </html>
-</jx:template>
+        -->
+      <p class="developer-header"> Developer Notes </p>
+      <p class="developer-note"> This is the last page of the sample. It is built by
the <i>prot_showTeam</i> function
+        in <b>team.js</b>. It takes the dream team list, stored in the Manager
class and adds it to the JXTemplate for
+        display. </p>
+      <p class="developer-note"> This page also uses some i18n tags to show words rather
than codes (for positions and
+        countries). </p>
+      <h2>Do study the code</h2>
+    </body>
+  </html>
+</jx:template>



Mime
View raw message