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 2013/06/05 23:15:36 UTC

[1/4] git commit: [flex-sdk] [refs/heads/develop] - fix project for MXMLC

Updated Branches:
  refs/heads/develop a4d4f05db -> 8738f48c8


fix project for MXMLC


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/4074d529
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/4074d529
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/4074d529

Branch: refs/heads/develop
Commit: 4074d5292ca102a74481b91bee47c4d2dd8722d7
Parents: a4d4f05
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 5 11:19:29 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 5 11:19:29 2013 -0700

----------------------------------------------------------------------
 modules/compiler/.classpath |   26 +++++---------------------
 1 files changed, 5 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4074d529/modules/compiler/.classpath
----------------------------------------------------------------------
diff --git a/modules/compiler/.classpath b/modules/compiler/.classpath
index 4f9a160..82adc34 100644
--- a/modules/compiler/.classpath
+++ b/modules/compiler/.classpath
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
--->
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -25,9 +7,11 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/flex-swfutils"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="var" path="FLEX_HOME/lib/batik-all-flex.jar"/>
-	<classpathentry kind="var" path="FLEX_HOME/lib/xercesImpl.jar"/>
+	<classpathentry kind="var" path="FLEX_HOME/lib/external/xercesImpl.jar"/>
 	<classpathentry kind="var" path="FLEX_HOME/lib/velocity-dep-1.4-flex.jar"/>
-	<classpathentry kind="var" path="FLEX_HOME/lib/commons-collections.jar"/>
-	<classpathentry kind="var" path="FLEX_HOME/lib/saxon9.jar"/>
+	<classpathentry kind="var" path="FLEX_HOME/lib/external/commons-collections.jar"/>
+	<classpathentry kind="var" path="FLEX_HOME/lib/external/saxon9.jar"/>
+	<classpathentry kind="lib" path="FLEX_HOME/lib/external/xml-apis-ext.jar"/>
+	<classpathentry kind="lib" path="FLEX_HOME/lib/external/xml-apis.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>


[2/4] git commit: [flex-sdk] [refs/heads/develop] - fix project for MXMLC

Posted by ah...@apache.org.
fix project for MXMLC


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f4fb535b
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f4fb535b
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f4fb535b

Branch: refs/heads/develop
Commit: f4fb535b7ce39f20933ae640ed50c7f22cbc32a5
Parents: 4074d52
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 5 11:30:04 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 5 11:30:04 2013 -0700

----------------------------------------------------------------------
 modules/compiler/.classpath |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f4fb535b/modules/compiler/.classpath
----------------------------------------------------------------------
diff --git a/modules/compiler/.classpath b/modules/compiler/.classpath
index 82adc34..6c81860 100644
--- a/modules/compiler/.classpath
+++ b/modules/compiler/.classpath
@@ -11,7 +11,7 @@
 	<classpathentry kind="var" path="FLEX_HOME/lib/velocity-dep-1.4-flex.jar"/>
 	<classpathentry kind="var" path="FLEX_HOME/lib/external/commons-collections.jar"/>
 	<classpathentry kind="var" path="FLEX_HOME/lib/external/saxon9.jar"/>
-	<classpathentry kind="lib" path="FLEX_HOME/lib/external/xml-apis-ext.jar"/>
-	<classpathentry kind="lib" path="FLEX_HOME/lib/external/xml-apis.jar"/>
+	<classpathentry kind="var" path="FLEX_HOME/lib/external/xml-apis-ext.jar"/>
+	<classpathentry kind="var" path="FLEX_HOME/lib/external/xml-apis.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>


[4/4] git commit: [flex-sdk] [refs/heads/develop] - attempt to show better error when problem with services-config.xml

Posted by ah...@apache.org.
attempt to show better error when problem with services-config.xml


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/8738f48c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/8738f48c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/8738f48c

Branch: refs/heads/develop
Commit: 8738f48c83bbc2a1f434ad7fd8ed31e6a5951002
Parents: 35f7a29
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 5 13:31:06 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 5 13:31:06 2013 -0700

----------------------------------------------------------------------
 .../config/ServicesDependenciesWrapper.java        |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/8738f48c/modules/compiler/src/java/flex2/compiler/config/ServicesDependenciesWrapper.java
----------------------------------------------------------------------
diff --git a/modules/compiler/src/java/flex2/compiler/config/ServicesDependenciesWrapper.java b/modules/compiler/src/java/flex2/compiler/config/ServicesDependenciesWrapper.java
index 720de92..15d85d1 100644
--- a/modules/compiler/src/java/flex2/compiler/config/ServicesDependenciesWrapper.java
+++ b/modules/compiler/src/java/flex2/compiler/config/ServicesDependenciesWrapper.java
@@ -69,7 +69,10 @@ public class ServicesDependenciesWrapper
             }
             catch (Throwable e3)
             {
-            	System.err.println(e3);
+            	if (e3 instanceof InvocationTargetException)
+            		System.err.println(((InvocationTargetException)e3).getCause());
+            	else
+            		System.err.println(e3);
             }
         }
         catch (NoSuchMethodException e2)


[3/4] git commit: [flex-sdk] [refs/heads/develop] - fix project for MXMLC

Posted by ah...@apache.org.
fix project for MXMLC


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/35f7a292
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/35f7a292
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/35f7a292

Branch: refs/heads/develop
Commit: 35f7a2923920c261b5e1f6cb541a7c2291123aef
Parents: f4fb535
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jun 5 12:11:05 2013 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jun 5 12:11:05 2013 -0700

----------------------------------------------------------------------
 modules/compiler/.classpath |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/35f7a292/modules/compiler/.classpath
----------------------------------------------------------------------
diff --git a/modules/compiler/.classpath b/modules/compiler/.classpath
index 6c81860..281af5e 100644
--- a/modules/compiler/.classpath
+++ b/modules/compiler/.classpath
@@ -13,5 +13,6 @@
 	<classpathentry kind="var" path="FLEX_HOME/lib/external/saxon9.jar"/>
 	<classpathentry kind="var" path="FLEX_HOME/lib/external/xml-apis-ext.jar"/>
 	<classpathentry kind="var" path="FLEX_HOME/lib/external/xml-apis.jar"/>
+	<classpathentry kind="var" path="FLEX_HOME/lib/external/optional/flex-messaging-common.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>