Permalink
Browse files

FLUID-2878: Ran the change line endings command from inside Aptana an…

…d an now checking back in the files.

svn path=/fluid/infusion/trunk/; revision=7297
  • Loading branch information...
1 parent e4d6f77 commit 6d59f4ddf941ecfda6bd3d3ea4fd4735516ea0a2 Eli Cochran committed Jun 2, 2009
Showing with 17,238 additions and 17,238 deletions.
  1. +42 −42 build-scripts/build.xml
  2. +46 −46 maven.xml
  3. +33 −33 project.xml
  4. +7 −7 src/webapp/WEB-INF/web.xml
  5. +28 −28 src/webapp/components/inlineEdit/css/InlineEdit.css
  6. +672 −672 src/webapp/components/inlineEdit/js/InlineEdit.js
  7. +303 −303 src/webapp/components/inlineEdit/js/InlineEditIntegrations.js
  8. +814 −814 src/webapp/components/pager/js/Pager.js
  9. +239 −239 src/webapp/components/reorderer/html/ImageReordererRSF.html
  10. +158 −158 src/webapp/components/reorderer/js/ImageReorderer.js
  11. +709 −709 src/webapp/components/reorderer/js/Reorderer.js
  12. +34 −34 src/webapp/components/uiOptions/css/Slider.css
  13. +55 −55 src/webapp/components/uiOptions/css/UIOptions.css
  14. +17 −17 src/webapp/components/uiOptions/css/UIOptionsPreview.css
  15. +178 −178 src/webapp/components/uiOptions/html/UIOptions.html
  16. +85 −85 src/webapp/components/uiOptions/html/UIOptionsPreview.html
  17. +348 −348 src/webapp/framework/core/js/DataBinding.js
  18. +269 −269 src/webapp/framework/fss/css/fss-layout.css
  19. +137 −137 src/webapp/framework/fss/css/fss-reset.css
  20. +192 −192 src/webapp/framework/fss/css/fss-text.css
  21. +183 −183 src/webapp/framework/fss/css/fss-theme-coal.css
  22. +24 −24 src/webapp/framework/fss/css/fss-theme-debug.css
  23. +112 −112 src/webapp/framework/fss/css/fss-theme-hc.css
  24. +112 −112 src/webapp/framework/fss/css/fss-theme-hci.css
  25. +167 −167 src/webapp/framework/fss/css/fss-theme-mist.css
  26. +139 −139 src/webapp/framework/fss/css/fss-theme-rust.css
  27. +170 −170 src/webapp/framework/fss/css/fss-theme-slate.css
  28. +664 −664 src/webapp/framework/renderer/js/fluidParser.js
  29. +1,430 −1,430 src/webapp/framework/renderer/js/fluidRenderer.js
  30. +2 −2 src/webapp/integration-demos/bspace/html/section-info-inner.html
  31. +3 −3 src/webapp/integration-demos/sakai/css/announcements.css
  32. +18 −18 src/webapp/integration-demos/sakai/css/overrides.css
  33. +1 −1 src/webapp/integration-demos/sakai/css/sakai.components.ui-options.css
  34. +31 −31 src/webapp/integration-demos/sakai/css/sakai.css
  35. +47 −47 src/webapp/integration-demos/sakai/css/sakai.layout.css
  36. +12 −12 src/webapp/integration-demos/sakai/css/sakai.theme.coal.css
  37. +17 −17 src/webapp/integration-demos/sakai/css/sakai.theme.mist.css
  38. +16 −16 src/webapp/integration-demos/sakai/css/sakai.theme.rust.css
  39. +9 −9 src/webapp/integration-demos/sakai/css/sakai.theme.slate.css
  40. +56 −56 src/webapp/integration-demos/sakai/html/UIOptionsPreview.html
  41. +14 −14 src/webapp/integration-demos/sakai/html/inline-edit-announcements.html
  42. +5 −5 src/webapp/integration-demos/sakai/html/pager-site-setting.html
  43. +240 −240 src/webapp/integration-demos/sakai/html/ui-options-fss-sakai.html
  44. +84 −84 src/webapp/integration-demos/sakai/js/sakai.js
  45. +5 −5 src/webapp/integration-demos/uportal/html/portal.html
  46. +471 −471 src/webapp/lib/fastXmlPull/js/fastXmlPull.js
  47. +144 −144 src/webapp/lib/jquery/core/js/jquery.js
  48. +9 −9 src/webapp/lib/jquery/plugins/tooltip/css/jquery.tooltip.css
  49. +1 −1 src/webapp/standalone-demos/keyboard-a11y/css/Focus.css
  50. +18 −18 src/webapp/standalone-demos/keyboard-a11y/html/CheckboxExample.html
  51. +80 −80 src/webapp/standalone-demos/keyboard-a11y/js/AccessibleCheckbox.js
  52. +615 −615 src/webapp/standalone-demos/lib/jquery/js/ui.tabs.js
  53. +1 −1 src/webapp/standalone-demos/pager/html/pager.html
  54. +66 −66 src/webapp/standalone-demos/quick-start-examples/fss/css/FSSDemo.css
  55. +88 −88 src/webapp/standalone-demos/quick-start-examples/fss/html/FSS-helpers.html
  56. +139 −139 src/webapp/standalone-demos/quick-start-examples/fss/html/FSS-layout.html
  57. +403 −403 src/webapp/standalone-demos/quick-start-examples/fss/html/FSS-text.html
  58. +438 −438 src/webapp/standalone-demos/quick-start-examples/fss/html/FSS-themes.html
  59. +127 −127 src/webapp/standalone-demos/quick-start-examples/reorderer/html/LayoutReorderer.html
  60. +68 −68 src/webapp/standalone-demos/renderer/css/renderer-examples.css
  61. +1 −1 src/webapp/standalone-demos/renderer/html/data-bound-menu.html
  62. +60 −60 src/webapp/standalone-demos/renderer/html/id-based-inventory.html
  63. +62 −62 src/webapp/standalone-demos/renderer/html/selector-based-inventory.html
  64. +182 −182 src/webapp/standalone-demos/renderer/js/data-bound-menu.js
  65. +113 −113 src/webapp/standalone-demos/renderer/js/id-based-inventory.js
  66. +140 −140 src/webapp/standalone-demos/renderer/js/programmatic-tree-menu.js
  67. +133 −133 src/webapp/standalone-demos/renderer/js/selector-based-inventory.js
  68. +60 −60 src/webapp/standalone-demos/reorderer/css/markup-examples.css
  69. +49 −49 src/webapp/standalone-demos/reorderer/css/todo-list.css
  70. +211 −211 src/webapp/standalone-demos/reorderer/html/image-reorderer.html
  71. +5 −5 src/webapp/standalone-demos/reorderer/html/jquery-tabs.html
  72. +3 −3 src/webapp/standalone-demos/reorderer/html/sortable-styled-todo-list.html
  73. +1 −1 src/webapp/standalone-demos/table-of-contents/html/TableOfContents.html
  74. +30 −30 src/webapp/tests/component-tests/inlineEdit/html/InlineEdit-test.html
  75. +666 −666 src/webapp/tests/component-tests/inlineEdit/js/InlineEditTests.js
  76. +1 −1 src/webapp/tests/component-tests/pager/html/Pager-test.html
  77. +62 −62 src/webapp/tests/component-tests/reorderer/html/GeometricManager-test.html
  78. +284 −284 src/webapp/tests/component-tests/reorderer/html/ImageReorderer-test.html
  79. +129 −129 src/webapp/tests/component-tests/reorderer/html/LayoutReorderer-test.html
  80. +28 −28 src/webapp/tests/component-tests/reorderer/html/ReorderList-test.html
  81. +55 −55 src/webapp/tests/component-tests/reorderer/html/Scheduler-test.html
  82. +172 −172 src/webapp/tests/component-tests/reorderer/js/GeometricManagerTests.js
  83. +590 −590 src/webapp/tests/component-tests/reorderer/js/ImageReordererTests.js
  84. +109 −109 src/webapp/tests/component-tests/reorderer/js/ReordererTestUtils.js
  85. +115 −115 src/webapp/tests/component-tests/reorderer/js/SchedulerTests.js
  86. +2 −2 src/webapp/tests/component-tests/uiOptions/html/UIOptions-test.html
  87. +43 −43 src/webapp/tests/escalated-tests/html/jquery-tabs.html
  88. +40 −40 src/webapp/tests/framework-tests/core/html/DataBinding-test.html
  89. +1 −1 src/webapp/tests/framework-tests/core/html/keyboard-a11y-tests.html
  90. +100 −100 src/webapp/tests/framework-tests/core/js/DataBindingTests.js
  91. +24 −24 src/webapp/tests/framework-tests/jqUnit/html/jqUnit-tests.html
  92. +190 −190 src/webapp/tests/framework-tests/renderer/html/Renderer-test.html
  93. +750 −750 src/webapp/tests/framework-tests/renderer/js/RendererTests.js
  94. +152 −152 src/webapp/tests/lib/jquery-ui/js/jquery.simulate.js
  95. +5 −5 src/webapp/tests/manual-tests/css/InlineEdit.css
  96. +2 −2 src/webapp/tests/manual-tests/css/InlineEditSelectbox.css
  97. +31 −31 src/webapp/tests/manual-tests/html/InlineEdit.html
  98. +42 −42 src/webapp/tests/manual-tests/html/bound-textarea.html
  99. +14 −14 src/webapp/tests/manual-tests/html/dropdown.html
  100. +57 −57 src/webapp/tests/manual-tests/html/dynamic-reorderer.html
  101. +11 −11 src/webapp/tests/manual-tests/html/renderer-component-types.html
  102. +7 −7 src/webapp/tests/manual-tests/html/simple-scroller.html
  103. +10 −10 src/webapp/tests/manual-tests/html/versioning.html
  104. +1,596 −1,596 src/webapp/tests/manual-tests/js/Fluid-0.3.js
  105. +212 −212 src/webapp/tests/manual-tests/lib/jquery/plugins/selectbox/jquery.selectbox-0.5.js
  106. +93 −93 src/webapp/tests/test-core/utils/js/TestUtils.js
View
@@ -59,25 +59,25 @@
<mkdir dir="${licenses}" />
</target>
- <!-- Target: Minify the specified files and copy them into the specified directory. Don't call this directly. -->
- <target name="minify">
- <apply executable="java" dest="${toDir}" parallel="false">
- <!-- The files to act upon. -->
- <fileset dir="${fromDir}" casesensitive="no">
- <include name="**/${file-pattern}" />
- <exclude name="**/test/*" />
- </fileset>
-
- <arg line="-jar" />
- <arg path="${yuicompressor}" />
- <srcfile/>
+ <!-- Target: Minify the specified files and copy them into the specified directory. Don't call this directly. -->
+ <target name="minify">
+ <apply executable="java" dest="${toDir}" parallel="false">
+ <!-- The files to act upon. -->
+ <fileset dir="${fromDir}" casesensitive="no">
+ <include name="**/${file-pattern}" />
+ <exclude name="**/test/*" />
+ </fileset>
+
+ <arg line="-jar" />
+ <arg path="${yuicompressor}" />
+ <srcfile/>
<arg line="--nomunge" />
- <!-- -o option for YUI Compressor to output minified JS to a file instead of stdout. -->
- <arg line="${lineBreakArg}" />
- <arg line="-o" />
- <mapper type="glob" from="${file-pattern}" to="${file-pattern}" />
- <targetfile />
- </apply>
+ <!-- -o option for YUI Compressor to output minified JS to a file instead of stdout. -->
+ <arg line="${lineBreakArg}" />
+ <arg line="-o" />
+ <mapper type="glob" from="${file-pattern}" to="${file-pattern}" />
+ <targetfile />
+ </apply>
</target>
<!-- Minifies javascript and css files and puts them into the distribution -->
@@ -147,37 +147,37 @@
</target>
<!-- Builds the WAR file using Maven 2 and copies it to the distribution folder. -->
- <target name="buildWAR">
- <condition property="isWindows">
- <os family="windows" />
- </condition>
- <antcall target="invokeMavenForWAR"/>
+ <target name="buildWAR">
+ <condition property="isWindows">
+ <os family="windows" />
+ </condition>
+ <antcall target="invokeMavenForWAR"/>
<antcall target="invokeMavenForWARWindows"/>
<echo>Copying war file ${build}/war/target/${warfile} to ${dist}...</echo>
<copy todir="${dist}">
<fileset dir="${build}/war/target">
<include name="${warfile}" />
</fileset>
</copy>
- </target>
-
- <target name="invokeMavenForWAR" unless="isWindows">
- <echo>Building war file...</echo>
- <apply executable="mvn" dir="${build}/war" parallel="true">
- <fileset dir=".">
- <include name="pom.xml"/>
- </fileset>
- <arg value="install" />
- </apply>
- </target>
-
- <target name="invokeMavenForWARWindows" if="isWindows">
- <apply executable="cmd" dir="${build}/war" parallel="true" vmlauncher="false">
- <fileset dir=".">
- <include name="pom.xml"/>
- </fileset>
- <arg value="/c mvn.bat install" />
- </apply>
+ </target>
+
+ <target name="invokeMavenForWAR" unless="isWindows">
+ <echo>Building war file...</echo>
+ <apply executable="mvn" dir="${build}/war" parallel="true">
+ <fileset dir=".">
+ <include name="pom.xml"/>
+ </fileset>
+ <arg value="install" />
+ </apply>
+ </target>
+
+ <target name="invokeMavenForWARWindows" if="isWindows">
+ <apply executable="cmd" dir="${build}/war" parallel="true" vmlauncher="false">
+ <fileset dir=".">
+ <include name="pom.xml"/>
+ </fileset>
+ <arg value="/c mvn.bat install" />
+ </apply>
</target>
<!-- Builds the core Infusion WAR file. -->
View
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- default goal for the project builds and installs the war in the local repository -->
-<project default="full" xmlns:j="jelly:core"
- xmlns:maven="jelly:maven">
-
- <!-- the common "full" goal invokes the default goal. Used in maven -Dgoal=full multiproject:goal from .. -->
- <goal name="full">
- <!--attainGoal name="dependencies" /-->
- <attainGoal name="war:install" />
- </goal>
-
- <!-- Override jar:install goal to compose "partial WAR" strategy -->
- <goal name="jar:install">
- <attainGoal name="war:install"/>
- </goal>
-
-<!-- This standard stanza is required for any webapps participating in the
- "partial WAR" build strategy -->
- <preGoal name="war:resources">
- <echo>Expanding webapp dependencies</echo>
-
- <mkdir dir="${maven.war.webapp.dir}" />
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="dep" value="${lib.dependency}" />
- <j:if test="${dep.getProperty('explode') == 'true'}">
- <j:if test="${dep.type =='war'}">
- <unjar src="${lib.path}" dest="${maven.war.webapp.dir}" />
- </j:if>
- </j:if>
- </j:forEach>
- </preGoal>
-
-<!-- Do not deploy for now, will be folded into each deployed user
- <goal name="deploy" prereqs="war:install">
- <maven:property defaultValue="${pom.artifactId}" var="webappName"
- name="deploy.webappname" />
- <j:set var="destination"
- value="${maven.tomcat.home}/webapps/${webappName}" />
- <delete dir="${destination}"/>
- <echo>Copying ${maven.war.build.dir}/${maven.war.final.name} to ${destination}.war</echo>
- <copy file="${maven.war.build.dir}/${maven.war.final.name}"
- tofile="${destination}.war"/>
- </goal>
--->
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- default goal for the project builds and installs the war in the local repository -->
+<project default="full" xmlns:j="jelly:core"
+ xmlns:maven="jelly:maven">
+
+ <!-- the common "full" goal invokes the default goal. Used in maven -Dgoal=full multiproject:goal from .. -->
+ <goal name="full">
+ <!--attainGoal name="dependencies" /-->
+ <attainGoal name="war:install" />
+ </goal>
+
+ <!-- Override jar:install goal to compose "partial WAR" strategy -->
+ <goal name="jar:install">
+ <attainGoal name="war:install"/>
+ </goal>
+
+<!-- This standard stanza is required for any webapps participating in the
+ "partial WAR" build strategy -->
+ <preGoal name="war:resources">
+ <echo>Expanding webapp dependencies</echo>
+
+ <mkdir dir="${maven.war.webapp.dir}" />
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}" />
+ <j:if test="${dep.getProperty('explode') == 'true'}">
+ <j:if test="${dep.type =='war'}">
+ <unjar src="${lib.path}" dest="${maven.war.webapp.dir}" />
+ </j:if>
+ </j:if>
+ </j:forEach>
+ </preGoal>
+
+<!-- Do not deploy for now, will be folded into each deployed user
+ <goal name="deploy" prereqs="war:install">
+ <maven:property defaultValue="${pom.artifactId}" var="webappName"
+ name="deploy.webappname" />
+ <j:set var="destination"
+ value="${maven.tomcat.home}/webapps/${webappName}" />
+ <delete dir="${destination}"/>
+ <echo>Copying ${maven.war.build.dir}/${maven.war.final.name} to ${destination}.war</echo>
+ <copy file="${maven.war.build.dir}/${maven.war.final.name}"
+ tofile="${destination}.war"/>
+ </goal>
+-->
+</project>
View
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <pomVersion>3</pomVersion>
- <artifactId>fluid-components</artifactId>
- <name>Fluid Infusion</name>
- <groupId>org.fluidproject</groupId>
- <currentVersion>1.1</currentVersion>
- <organization>
- <name>Fluid Project</name>
- <url>http://fluidproject.org</url>
- </organization>
- <inceptionYear>2007</inceptionYear>
- <properties>
- <!-- This project is NOT REALLY a JAR, but we want it not to deploy
- to the server when invoked as a byproduct of a Sakai build. -->
- <deploy.type>jar</deploy.type>
- </properties>
- <description>
- Fluid Components package, packaged for a standard Servlet environment.
- </description>
- <dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <pomVersion>3</pomVersion>
+ <artifactId>fluid-components</artifactId>
+ <name>Fluid Infusion</name>
+ <groupId>org.fluidproject</groupId>
+ <currentVersion>1.1</currentVersion>
+ <organization>
+ <name>Fluid Project</name>
+ <url>http://fluidproject.org</url>
+ </organization>
+ <inceptionYear>2007</inceptionYear>
+ <properties>
+ <!-- This project is NOT REALLY a JAR, but we want it not to deploy
+ to the server when invoked as a byproduct of a Sakai build. -->
+ <deploy.type>jar</deploy.type>
+ </properties>
+ <description>
+ Fluid Components package, packaged for a standard Servlet environment.
+ </description>
+ <dependencies>
</dependencies>
<repository>
<connection>scm:svn:https://source.sakaiproject.org/contrib/utoronto/fluid/components/trunk</connection>
- </repository>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
- </build>
-</project>
-
+ </repository>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+ </build>
+</project>
+
View
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-<!-- This empty web.xml is required by the darn Maven 2 war plugin - it should
-never appear in an application -->
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+<!-- This empty web.xml is required by the darn Maven 2 war plugin - it should
+never appear in an application -->
</web-app>
@@ -1,28 +1,28 @@
-.fl-inlineEdit-edit {margin:-2px; padding:0;}
-
-
-/* Base Appearance & States Appearance */
-.fl-inlineEdit-tooltip {
- position : absolute;
- background : #CCC;
- border : 1px solid #999;
- font : normal 75% sans-serif;
- padding : 3px 5px;
-}
-
-/* :hover */
-.fl-inlineEdit-invitation {
- border : 1px solid #999;
- background : lightyellow;
- cursor : pointer;
- /*margin : -1px;*/
-}
-
-/* :focus */
-.fl-inlineEdit-focus{
-
-}
-
-
-/* Themed Appearance + Themed States */
-
+.fl-inlineEdit-edit {margin:-2px; padding:0;}
+
+
+/* Base Appearance & States Appearance */
+.fl-inlineEdit-tooltip {
+ position : absolute;
+ background : #CCC;
+ border : 1px solid #999;
+ font : normal 75% sans-serif;
+ padding : 3px 5px;
+}
+
+/* :hover */
+.fl-inlineEdit-invitation {
+ border : 1px solid #999;
+ background : lightyellow;
+ cursor : pointer;
+ /*margin : -1px;*/
+}
+
+/* :focus */
+.fl-inlineEdit-focus{
+
+}
+
+
+/* Themed Appearance + Themed States */
+
Oops, something went wrong.

0 comments on commit 6d59f4d

Please sign in to comment.