You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/05/01 06:30:30 UTC
[1/4] git commit: fix some glitches in the files
Repository: flex-blazeds
Updated Branches:
refs/heads/master 089523d22 -> 5f7c8cf6a
fix some glitches in the files
Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/040de411
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/040de411
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/040de411
Branch: refs/heads/master
Commit: 040de4117d22c71d43ecd420b6247c0661fcfefb
Parents: 0a07c36
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 30 21:17:20 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 30 21:30:23 2014 -0700
----------------------------------------------------------------------
.../flex/messaging/security/TomcatLogin.java | 2 +-
qa/src/build.xml | 36 ++++++++++----------
2 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/040de411/modules/opt/src/tomcat/flex/messaging/security/TomcatLogin.java
----------------------------------------------------------------------
diff --git a/modules/opt/src/tomcat/flex/messaging/security/TomcatLogin.java b/modules/opt/src/tomcat/flex/messaging/security/TomcatLogin.java
index b8531f3..9591a76 100755
--- a/modules/opt/src/tomcat/flex/messaging/security/TomcatLogin.java
+++ b/modules/opt/src/tomcat/flex/messaging/security/TomcatLogin.java
@@ -35,7 +35,7 @@ public interface TomcatLogin
*
* @param username username.
* @param password credentials.
- * @param request request via which this login attempt was made.�
+ * @param request request via which this login attempt was made
* @return Principal generated for user if login were successful
*/
Principal login(String username, String password, HttpServletRequest request);
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/040de411/qa/src/build.xml
----------------------------------------------------------------------
diff --git a/qa/src/build.xml b/qa/src/build.xml
index 42fd900..822daa8 100755
--- a/qa/src/build.xml
+++ b/qa/src/build.xml
@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,26 +22,26 @@
<project name="BlazeDS QA Source" default="main" basedir="..">
<property environment="env"/>
<property name="qa.dir" value="${basedir}"/>
- <property name="src.dir" value="${basedir}/src"/>
- <property name="classes.dir" value="${basedir}/classes"/>
+ <property name="src.dir" value="${basedir}/src"/>
+ <property name="classes.dir" value="${basedir}/classes"/>
<property name="frameworks.filedrop" value="${qa.dir}/resources/frameworks"/>
-
- <!-- qa_frameworks contained proprietary testing harness -->
- <property name="no_framework" value="true" />
+
+ <!-- qa_frameworks contained proprietary testing harness -->
+ <property name="no_framework" value="true" />
- <path id="classpath">
- <fileset dir="${qa.dir}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
+ <path id="classpath">
+ <fileset dir="${qa.dir}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
<target name="main" depends="clean,frameworks,tools"/>
<target name="clean">
<echo message="Removing expanded framework files..."/>
<delete dir="${build.dir}"/>
- <delete dir="${classes.dir}"/>
+ <delete dir="${classes.dir}"/>
<delete failonerror="false" includeEmptyDirs="true">
<fileset dir="${framework.filedrop}/expanded">
<include name="**/*"/>
@@ -78,10 +78,10 @@
</fileset>
</copy>
</target>
-
- <target name="tools">
- <mkdir dir="${classes.dir}" />
- <javac source="1.5" deprecation="off" debug="true" nowarn="${nowarn}" destdir="${classes.dir}" srcdir="${src.dir}" classpathref="classpath" />
- </target>
+
+ <target name="tools">
+ <mkdir dir="${classes.dir}" />
+ <javac source="1.5" deprecation="off" debug="true" nowarn="${nowarn}" destdir="${classes.dir}" srcdir="${src.dir}" classpathref="classpath" />
+ </target>
</project>
[2/4] git commit: add .gitignore file
Posted by ah...@apache.org.
add .gitignore file
Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/0a07c363
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/0a07c363
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/0a07c363
Branch: refs/heads/master
Commit: 0a07c363f1488cb97084c937e532b3fc18c831ec
Parents: 089523d
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 30 21:16:59 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 30 21:30:23 2014 -0700
----------------------------------------------------------------------
.gitignore | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 174 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/0a07c363/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..517f035
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,174 @@
+# eclipse conf file
+.settings
+.classpath
+.project
+.manager
+.scala_dependencies
+.cache
+
+# idea conf files
+.idea
+*.iml
+*.ipr
+*.iws
+
+# building
+target
+[Bb]uild/
+null
+tmp
+temp
+dist
+test-output
+build.log
+release
+out
+gen
+local.properties
+
+#Apache Flex Projects
+lib/
+libs/
+in/
+swfobject/
+flex2/
+thirdparty/
+META-INF/
+tempDoc/
+air/
+
+*.pbj
+*.vms
+*.ser
+*.mxp
+bundles.properties
+css_*.properties
+FXGException_*.properties
+FXGLog_*.properties
+FABridge.js
+frameworks/projects/spark/manifest.xml
+env.properties
+local.properties
+packages.dita
+rat.report
+airsdk.xml
+
+#OS junk files
+[Tt]humbs.db
+*.DS_Store
+
+#Visual Studio files
+*.[Oo]bj
+*.user
+*.aps
+*.pch
+*.vspscc
+*.vssscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak
+*.[Cc]ache
+*.ilk
+*.log
+*.lib
+*.sbr
+*.sdf
+ipch/
+obj/
+[Bb]in
+[Dd]ebug*/
+[Rr]elease*/
+Ankh.NoLoad
+
+#Tooling
+_ReSharper*/
+*.resharper
+[Tt]est[Rr]esult*
+
+#CVS files
+.svn
+.git
+
+# Office Temp Files
+~$*
+
+#Binaries
+*.dll
+*.bin
+*.com
+*.exe
+*.class
+*.jar
+*.swf
+*.swc
+
+#Compressed Files
+*.zip
+*.rar
+*.tar
+
+/asdoc-output/
+
+#mustellarunner
+*.patch
+*.reply
+mailbody.txt
+gitstatus.txt
+
+#AIR SDK
+frameworks/projects/air/
+runtimes/
+templates/air/
+samples/badge/
+samples/icons/
+templates/air/
+templates/extensions/
+templates/sdk/
+install/android
+AIR SDK Readme.txt
+AIR SDK license.pdf
+air-sdk-description.xml
+samples/descriptor-sample.xml
+include/FlashRuntimeExtensions.h
+
+#BlazeDS generated/copied
+apps/blazeds/WEB-INF/flex/version.properties
+apps/ds-console/history/
+apps/ds-console/index.html
+apps/ds-console/swfobject.js
+apps/samples/WEB-INF/classes/
+apps/samples/WEB-INF/flex/version.properties
+asdoc/
+frameworks/air-config-template.xml
+frameworks/air-config.xml
+frameworks/airmobile-config-template.xml
+frameworks/airmobile-config.xml
+frameworks/apache-manifest.xml
+frameworks/build_framework.xml
+frameworks/downloads.xml
+frameworks/experimental-manifest.xml
+frameworks/experimental-mobile-manifest.xml
+frameworks/flash-unicode-table.xml
+frameworks/flex-config-template.xml
+frameworks/flex-config.xml
+frameworks/flex-sdk-description.xml
+frameworks/locale/
+frameworks/metadata.xml
+frameworks/mx-manifest.xml
+frameworks/mxml-2009-manifest.xml
+frameworks/mxml-manifest.xml
+frameworks/spark-manifest.xml
+frameworks/tests/
+frameworks/themes/
+modules/core/classes/
+modules/core/src/ExcludeDoclet.java
+qa/resources/config/air-config.xml
+qa/resources/config/flex-config.xml
+resources/security/tomcat/TomcatValve.java
+servers/apache-tomcat-6.0.29/
+templates/
+
[4/4] git commit: switch to XMLUtils. If we need XMLSerializer,
we will need to check the license and then download it during builds
Posted by ah...@apache.org.
switch to XMLUtils. If we need XMLSerializer, we will need to check the license and then download it during builds
Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/5f7c8cf6
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/5f7c8cf6
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/5f7c8cf6
Branch: refs/heads/master
Commit: 5f7c8cf6a8be4fa8a23ea86b11b8bee6eebbbd21
Parents: ac458b5
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 30 21:29:33 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 30 21:30:24 2014 -0700
----------------------------------------------------------------------
qa/src/utils/XMLMerge.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/5f7c8cf6/qa/src/utils/XMLMerge.java
----------------------------------------------------------------------
diff --git a/qa/src/utils/XMLMerge.java b/qa/src/utils/XMLMerge.java
index 5bb1910..e708bbe 100644
--- a/qa/src/utils/XMLMerge.java
+++ b/qa/src/utils/XMLMerge.java
@@ -235,14 +235,14 @@ public class XMLMerge {
*/
// Alternative #2 - everything on its own line including text. Some extra spaces. Looks strange.
- /*
XMLUtils.PrettyDocumentToWriter(doc, fileWriter);
fileWriter.close();
- */
+
// Alternative #3 - but without setPreserveSpace() it's all bunched together and
// with setPreserveSpace() it's the same as the original.
+ /*
OutputFormat format = new OutputFormat(doc);
format.setLineWidth(65);
format.setIndenting(true);
@@ -250,6 +250,7 @@ public class XMLMerge {
//format.setPreserveSpace();
org.apache.xml.serialize.XMLSerializer serializer = new XMLSerializer(fileWriter, format);
serializer.serialize(doc);
+ */
} catch (FileNotFoundException fnf) {
System.out.println("FILE NOT FOUND!!!" + filename);
[3/4] git commit: add more files to .gitignore
Posted by ah...@apache.org.
add more files to .gitignore
Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/ac458b50
Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/ac458b50
Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/ac458b50
Branch: refs/heads/master
Commit: ac458b50c3a959924c3295d27ed331cfb4f525fd
Parents: 040de41
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 30 21:28:32 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 30 21:30:24 2014 -0700
----------------------------------------------------------------------
.gitignore | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/ac458b50/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 517f035..bbd3db6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,4 +171,52 @@ qa/resources/config/flex-config.xml
resources/security/tomcat/TomcatValve.java
servers/apache-tomcat-6.0.29/
templates/
+apps/team/WEB-INF/flex/air-config.xml
+apps/team/WEB-INF/flex/apache-manifest.xml
+apps/team/WEB-INF/flex/experimental-manifest.xml
+apps/team/WEB-INF/flex/experimental-mobile-manifest.xml
+apps/team/WEB-INF/flex/flash-unicode-table.xml
+apps/team/WEB-INF/flex/flex-config.xml
+apps/team/WEB-INF/flex/flex-sdk-description.xml
+apps/team/WEB-INF/flex/flex-webtier-config.xml
+apps/team/WEB-INF/flex/locale/
+apps/team/WEB-INF/flex/mx-manifest.xml
+apps/team/WEB-INF/flex/mxml-2009-manifest.xml
+apps/team/WEB-INF/flex/mxml-manifest.xml
+apps/team/WEB-INF/flex/spark-manifest.xml
+apps/team/WEB-INF/flex/themes/
+apps/team/WEB-INF/web.xml
+apps/team/history/
+qa/apps/qa-manual/WEB-INF/flex/apache-manifest.xml
+qa/apps/qa-manual/WEB-INF/flex/experimental-manifest.xml
+qa/apps/qa-manual/WEB-INF/flex/experimental-mobile-manifest.xml
+qa/apps/qa-manual/WEB-INF/flex/flash-unicode-table.xml
+qa/apps/qa-manual/WEB-INF/flex/flex-sdk-description.xml
+qa/apps/qa-manual/WEB-INF/flex/locale/
+qa/apps/qa-manual/WEB-INF/flex/mx-manifest.xml
+qa/apps/qa-manual/WEB-INF/flex/mxml-2009-manifest.xml
+qa/apps/qa-manual/WEB-INF/flex/mxml-manifest.xml
+qa/apps/qa-manual/WEB-INF/flex/spark-manifest.xml
+qa/apps/qa-manual/WEB-INF/flex/themes/
+qa/apps/qa-manual/WEB-INF/flex/version.properties
+qa/apps/qa-manual/WEB-INF/src/qa/utils/mxml/
+qa/apps/qa-manual/WEB-INF/web.xml
+qa/apps/qa-manual/history/
+qa/apps/qa-regress/WEB-INF/classes/
+qa/apps/qa-regress/WEB-INF/flex/apache-manifest.xml
+qa/apps/qa-regress/WEB-INF/flex/experimental-manifest.xml
+qa/apps/qa-regress/WEB-INF/flex/experimental-mobile-manifest.xml
+qa/apps/qa-regress/WEB-INF/flex/flash-unicode-table.xml
+qa/apps/qa-regress/WEB-INF/flex/flex-sdk-description.xml
+qa/apps/qa-regress/WEB-INF/flex/locale/
+qa/apps/qa-regress/WEB-INF/flex/mx-manifest.xml
+qa/apps/qa-regress/WEB-INF/flex/mxml-2009-manifest.xml
+qa/apps/qa-regress/WEB-INF/flex/mxml-manifest.xml
+qa/apps/qa-regress/WEB-INF/flex/spark-manifest.xml
+qa/apps/qa-regress/WEB-INF/flex/themes/
+qa/apps/qa-regress/WEB-INF/flex/version.properties
+qa/apps/qa-regress/WEB-INF/src/qa/utils/
+qa/apps/qa-regress/WEB-INF/web.xml
+qa/apps/qa-regress/WEB-INF/web.xml.spring
+qa/apps/qa-regress/history/