git commit: [flex-falcon] [refs/heads/develop] - use overwrite (commons-io is copied twice)
Repository: flex-falcon
Updated Branches:
refs/heads/develop 13574ed54 - 3353e2c0c
use overwrite (commons-io is copied twice)
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3353e2c0
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3353e2c0
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3353e2c0
Branch: refs/heads/develop
Commit: 3353e2c0cff6608b8b3b139a404894b59a6e5baa
Parents: 13574ed
Author: Alex Harui aha...@apache.org
Authored: Thu May 29 23:56:00 2014 -0700
Committer: Alex Harui aha...@apache.org
Committed: Thu May 29 23:56:00 2014 -0700
--
compiler.jx/downloads.xml | 2 +-
compiler/downloads.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3353e2c0/compiler.jx/downloads.xml
--
diff --git a/compiler.jx/downloads.xml b/compiler.jx/downloads.xml
index b052420..034d2e5 100644
--- a/compiler.jx/downloads.xml
+++ b/compiler.jx/downloads.xml
@@ -177,7 +177,7 @@
/target
target name=copy-if-cached if=found-in-cache
- copy file=${downloadCacheFolder}/${srcFolder}/${srcFile}
tofile=${dest} /
+ copy file=${downloadCacheFolder}/${srcFolder}/${srcFile}
tofile=${dest} overwrite=true /
/target
target name=check-cache if=usingDownloadCache
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3353e2c0/compiler/downloads.xml
--
diff --git a/compiler/downloads.xml b/compiler/downloads.xml
index 87c97f6..6a32fc8 100644
--- a/compiler/downloads.xml
+++ b/compiler/downloads.xml
@@ -212,7 +212,7 @@
/target
target name=copy-if-cached if=found-in-cache
- copy file=${downloadCacheFolder}/${srcFolder}/${srcFile}
tofile=${dest} /
+ copy file=${downloadCacheFolder}/${srcFolder}/${srcFile}
tofile=${dest} overwrite=true/
/target
target name=check-cache if=usingDownloadCache
Jenkins build is still unstable: flex-falcon #65
See http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/changes
git commit: [flex-sdk] [refs/heads/develop] - FLEX-34346: BP in mxml inline item renderer shouldn't be consider as Ambiguous
Repository: flex-sdk
Updated Branches:
refs/heads/develop efca6dcc7 - f63264719
FLEX-34346: BP in mxml inline item renderer shouldn't be consider as Ambiguous
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/f6326471
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/f6326471
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/f6326471
Branch: refs/heads/develop
Commit: f6326471970d15b221d5d0d5b557db05d8ddbcde
Parents: efca6dc
Author: Fr�d�ric THMOAS ftho...@apache.org
Authored: Fri May 30 11:56:21 2014 +0100
Committer: Fr�d�ric THMOAS ftho...@apache.org
Committed: Fri May 30 11:56:21 2014 +0100
--
.../src/java/flex/tools/debugger/cli/DebugCLI.java | 12 ++--
.../flex/tools/debugger/cli/FileInfoCache.java | 17 ++---
2 files changed, 20 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f6326471/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
--
diff --git a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
index 9eb7f5e..a84e87a 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
@@ -3237,14 +3237,14 @@ public class DebugCLI implements Runnable,
SourceLocator {
private boolean tryResolveBreakpoint(BreakAction b, StringBuilder sb)
throws AmbiguousException {
int status = b.getStatus();
boolean resolved = (status == BreakAction.RESOLVED);
-if (status == BreakAction.UNRESOLVED || resolved) // we don't do
anything for AMBIGUOUS
+if (status == BreakAction.UNRESOLVED) // we don't do anything for
AMBIGUOUS
{
/* wait a bit if we are not halted */
try {
waitTilHalted(m_activeIsolate);
int module = propertyGet(LIST_MODULE);
int line = propertyGet(LIST_LINE);
-int isolateId = propertyGet(LIST_WORKER);
+int isolateId;
String arg = b.getBreakpointExpression();
@@ -3272,12 +3272,12 @@ public class DebugCLI implements Runnable,
SourceLocator {
MapString, Object args = new HashMapString,
Object();
String formatString;
args.put(breakpointNumber,
Integer.toString(b.getId())); //$NON-NLS-1$
-String filename = file.getName();
+String filename = file != null ? file.getName() : null;
if (b.isSingleSwf() file != null) {
filename = filename + # + file.getId();
//$NON-NLS-1$
}
args.put(file, filename); //$NON-NLS-1$
-args.put(line, new Integer(l.getLine()));
//$NON-NLS-1$
+args.put(line, l != null ? l.getLine() : 0);
//$NON-NLS-1$
if (funcName != null) {
args.put(functionName, funcName); //$NON-NLS-1$
@@ -3290,7 +3290,7 @@ public class DebugCLI implements Runnable, SourceLocator {
sb.append(m_newline);
sb.append(m_newline);
-resolved |= true;
+resolved = true;
}
}
} catch (NotConnectedException e) {
@@ -3365,7 +3365,7 @@ public class DebugCLI implements Runnable, SourceLocator {
*/
Location findAndEnableBreak(final SwfInfo swf, final SourceFile file,
final int line) throws NotConnectedException, InProgressException {
if (swf == null) {
-return breakEnableRequest(file.getId(), line, swf.getIsolateId());
+return breakEnableRequest(file.getId(), line, m_activeIsolate);
}
for (final SourceFile similarFile : getSimilarSourceFilesInSwf(swf,
file)) {
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/f6326471/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
--
diff --git
a/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
b/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
index b122e7c..33fc68a 100644
--- a/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
+++ b/modules/debugger/src/java/flex/tools/debugger/cli/FileInfoCache.java
@@ -549,11 +549,11 @@ public class FileInfoCache implements
ComparatorSourceFile
exactHitAt = i;
break;
git commit: [flex-asjs] [refs/heads/develop] - Updated Map API with new classes and more functions.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 2ea9912fb - 26eadd3f2
Updated Map API with new classes and more functions.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/26eadd3f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/26eadd3f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/26eadd3f
Branch: refs/heads/develop
Commit: 26eadd3f23abd3217a21dfbba1a7dffa76c3b4d3
Parents: 2ea9912
Author: Peter Ent p...@apache.org
Authored: Fri May 30 16:42:38 2014 -0400
Committer: Peter Ent p...@apache.org
Committed: Fri May 30 16:42:38 2014 -0400
--
.../src/org/apache/flex/maps/google/Geometry.as | 30 +
.../src/org/apache/flex/maps/google/LatLng.as | 30 +
.../src/org/apache/flex/maps/google/Map.as | 7 +
.../src/org/apache/flex/maps/google/Place.as| 43 ++
.../apache/flex/maps/google/beads/MapView.as| 104 +++
.../src/org/apache/flex/maps/google/Map.js | 131 +--
.../apache/flex/maps/google/beads/MapView.js| 14 +-
7 files changed, 316 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/26eadd3f/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/Geometry.as
--
diff --git
a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/Geometry.as
b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/Geometry.as
new file mode 100644
index 000..4546bf0
--- /dev/null
+++
b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/Geometry.as
@@ -0,0 +1,30 @@
+
+//
+// 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.
+//
+
+package org.apache.flex.maps.google
+{
+ public class Geometry
+ {
+ public function Geometry()
+ {
+ location = new LatLng();
+ }
+
+ public var location:LatLng;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/26eadd3f/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/LatLng.as
--
diff --git
a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/LatLng.as
b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/LatLng.as
new file mode 100644
index 000..80e688c
--- /dev/null
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/maps/google/LatLng.as
@@ -0,0 +1,30 @@
+
+//
+// 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.
+//
+
+package org.apache.flex.maps.google
+{
+ public class LatLng
+ {
+ public function LatLng()
+ {
+ }
+
+ public var lat:Number;
+ public var lng:Number;
+ }
+}
\ No newline at end of file
[2/2] git commit: [flex-asjs] [refs/heads/develop] - ant-based caching appeas to work
ant-based caching appeas to work
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8a430661
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8a430661
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8a430661
Branch: refs/heads/develop
Commit: 8a430661608f8090d4fddc9f356f2eca09bf6a26
Parents: 26eadd3
Author: Alex Harui aha...@apache.org
Authored: Fri May 30 11:46:37 2014 -0700
Committer: Alex Harui aha...@apache.org
Committed: Fri May 30 15:36:33 2014 -0700
--
installer.xml | 282 ++---
1 file changed, 180 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8a430661/installer.xml
--
diff --git a/installer.xml b/installer.xml
index 2d6aefe..38bf8e2 100644
--- a/installer.xml
+++ b/installer.xml
@@ -22,6 +22,13 @@
property name=FLEXJS_HOME location=${basedir}/
+ !-- this script supports the usingDownloadCache property and
+downloadCacheFolder property to cache downloads in the
+folder specified by downloadCacheFolder. This can make
+a huge difference in future runs although there is some
+risk around caching bad downloads and/or needing to
+clean up the cache --
+
!-- Required for OSX 10.6 / Snow Leopard Performance. --
!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only --
!-- local.d32 is set/used in build.properties so this needs to be done
first. --
@@ -50,7 +57,8 @@
property name=flexjs.version value=0.0.2/
property name=falcon.version value=0.0.2/
-property name=goog.lib.url.path
value=https://closure-library.googlecode.com/files; /
+property name=goog.lib.url.server
value=https://closure-library.googlecode.com; /
+property name=goog.lib.url.folder value=files /
property name=goog.lib.url.file
value=closure-library-20130212-95c19e7f0f5f.zip /
property name=goog.lib.md5 value=7891ce8200dedf50c811017a0d76bcdc /
@@ -124,16 +132,20 @@
property name=do-not-cache-next-get value=true /
get src=${xml.properties}
dest=${basedir}/sdk-installer-config-4.0.xml /
xmlproperty file=${basedir}/sdk-installer-config-4.0.xml
semanticAttributes=true collapseAttributes=true/
-property name=air.sdk.url.path.ref
value=air.sdk.path.${platform}.${air.sdk.version} /
-property name=air.sdk.url.path refid=${air.sdk.url.path.ref} /
+property name=air.sdk.url.server.ref
value=air.sdk.server.${platform}.${air.sdk.version} /
+property name=air.sdk.url.server refid=${air.sdk.url.server.ref}
/
+property name=air.sdk.url.folder.ref
value=air.sdk.folder.${platform}.${air.sdk.version} /
+property name=air.sdk.url.folder refid=${air.sdk.url.folder.ref}
/
property name=air.sdk.url.file.ref
value=air.sdk.file.${platform}.${air.sdk.version} /
property name=air.sdk.url.file refid=${air.sdk.url.file.ref} /
property name=air.sdk.url.md5.ref
value=air.sdk.md5.${platform}.${air.sdk.version} /
condition property=air-has-md5
isreference refid=${air.sdk.url.md5.ref} /
/condition
-property name=flash.sdk.url.path.ref
value=flash.sdk.path.${flash.sdk.version} /
-property name=flash.sdk.url.path refid=${flash.sdk.url.path.ref}
/
+property name=flash.sdk.url.server.ref
value=flash.sdk.server.${flash.sdk.version} /
+property name=flash.sdk.url.server
refid=${flash.sdk.url.server.ref} /
+property name=flash.sdk.url.folder.ref
value=flash.sdk.folder.${flash.sdk.version} /
+property name=flash.sdk.url.folder
refid=${flash.sdk.url.folder.ref} /
property name=flash.sdk.url.file.ref
value=flash.sdk.file.${flash.sdk.version} /
property name=flash.sdk.url.file refid=${flash.sdk.url.file.ref}
/
property name=flash.sdk.url.md5.ref
value=flash.sdk.md5.${flash.sdk.version} /
@@ -308,51 +320,48 @@
/target
target name=falcon-get depends=falcon-get-check,set-falcon-cache-flag
unless=falcon.downloaded
mkdir dir=${download.dir}/
+ get
src=${falcon.md5.server.url}/${falcon.folder}/${falcon.file}.md5
verbose=true dest=${download.dir}/${falcon.file}.md5 /
echo${INFO_INSTALLING_FALCON}
${falcon.server.url}/${falcon.folder}/${falcon.file}/echo
antcall target=falcon_get_from_mirror
param name=server value=${falcon.server.url} /
+param name=md5server value=${falcon.md5.server.url} /
param name=folder value=${falcon.folder} /
param name=file value=${falcon.file} /
[1/2] git commit: [flex-asjs] [refs/heads/develop] - add timestamps to key URLs to bypass browser cache
Repository: flex-asjs
Updated Branches:
refs/heads/develop 26eadd3f2 - 9ac6c9812
add timestamps to key URLs to bypass browser cache
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9ac6c981
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9ac6c981
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9ac6c981
Branch: refs/heads/develop
Commit: 9ac6c98124109531e3efba5de388e82890bc2e6a
Parents: 8a43066
Author: Alex Harui aha...@apache.org
Authored: Fri May 30 15:36:14 2014 -0700
Committer: Alex Harui aha...@apache.org
Committed: Fri May 30 15:36:33 2014 -0700
--
installer.xml | 55 --
1 file changed, 45 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9ac6c981/installer.xml
--
diff --git a/installer.xml b/installer.xml
index 38bf8e2..453af2c 100644
--- a/installer.xml
+++ b/installer.xml
@@ -62,8 +62,6 @@
property name=goog.lib.url.file
value=closure-library-20130212-95c19e7f0f5f.zip /
property name=goog.lib.md5 value=7891ce8200dedf50c811017a0d76bcdc /
-property name=xml.properties
value=http://flex.apache.org/installer/sdk-installer-config-4.0.xml; /
-
condition property=platform value=mac
os family=mac /
/condition
@@ -127,9 +125,10 @@
target name=get-flash-md5-data if=flash-has-md5
property name=flash.sdk.url.md5 refid=${flash.sdk.url.md5.ref} /
/target
-
+
target name=get-data
-property name=do-not-cache-next-get value=true /
+ tstamp /
+ property name=xml.properties
value=http://flex.apache.org/installer/sdk-installer-config-4.0.xml?ts=${DSTAMP};
/
get src=${xml.properties}
dest=${basedir}/sdk-installer-config-4.0.xml /
xmlproperty file=${basedir}/sdk-installer-config-4.0.xml
semanticAttributes=true collapseAttributes=true/
property name=air.sdk.url.server.ref
value=air.sdk.server.${platform}.${air.sdk.version} /
@@ -320,7 +319,6 @@
/target
target name=falcon-get depends=falcon-get-check,set-falcon-cache-flag
unless=falcon.downloaded
mkdir dir=${download.dir}/
- get
src=${falcon.md5.server.url}/${falcon.folder}/${falcon.file}.md5
verbose=true dest=${download.dir}/${falcon.file}.md5 /
echo${INFO_INSTALLING_FALCON}
${falcon.server.url}/${falcon.folder}/${falcon.file}/echo
antcall target=falcon_get_from_mirror
param name=server value=${falcon.server.url} /
@@ -390,9 +388,9 @@
available file=${download.dir}/${flex.file}
property=flex.downloaded /
/target
target name=flex-get depends=flex-get-check unless=flex.downloaded
- get
src=${flex.md5.server.url}/${flex.folder}/${flex.file}.md5 verbose=true
dest=${download.dir}/${flex.file}.md5 /
echo${INFO_INSTALLING_FLEX}
${flex.server.url}/${flex.folder}/${flex.file}/echo
antcall target=flex_get_from_mirror
+param name=md5server value=${flex.md5.server.url} /
param name=server value=${flex.server.url} /
param name=folder value=${flex.folder} /
param name=file value=${flex.file} /
@@ -401,6 +399,7 @@
param name=failmessage value=Flex SDK download
failed /
/antcall
antcall target=flex_get_download
+param name=md5server value=${flex.md5.server.url} /
param name=server value=${flex.server.url} /
param name=folder value=${flex.folder} /
param name=file value=${flex.file} /
@@ -412,19 +411,19 @@
target name=flex_get_from_mirror if=flex.uses.mirror
antcall target=download_using_mirror
+param name=srcMD5Domain value=${md5server} /
param name=srcDomain value=${server} /
param name=srcFolder value=${folder} /
param name=srcFile value=${file} /
-param name=dest value=${dest} /
/antcall
/target
target name=flex_get_download unless=flex.uses.mirror
antcall target=download_using_get
+param name=srcMD5Domain value=${md5server} /
param name=srcDomain value=${server} /
param name=srcFolder value=${folder} /
param name=srcFile value=${file} /
-param name=dest value=${dest} /
/antcall
/target
@@ -942,7 +941,9 @@ tofile=${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc /
/target
target name=get-if-not-cached unless=found-in-cache
-get src=${srcDomain}/${srcFolder}/${srcFile} dest=${dest}/
+ antcall target=get-with-no-params /
+
[2/3] git commit: [flex-utilities] [refs/heads/develop] - trim md5
trim md5
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/9b3a6cf8
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/9b3a6cf8
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/9b3a6cf8
Branch: refs/heads/develop
Commit: 9b3a6cf83207bc9597adb7d51e08d47810d75cd9
Parents: 07b48a9
Author: Alex Harui aha...@apache.org
Authored: Fri May 30 15:40:29 2014 -0700
Committer: Alex Harui aha...@apache.org
Committed: Fri May 30 15:40:29 2014 -0700
--
ant_on_air/src/org/apache/flex/ant/tags/Checksum.as | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/9b3a6cf8/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
--
diff --git a/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
b/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
index fae0fc1..f881b14 100644
--- a/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
+++ b/ant_on_air/src/org/apache/flex/ant/tags/Checksum.as
@@ -28,6 +28,7 @@ package org.apache.flex.ant.tags
import flash.utils.ByteArray;
import mx.core.IFlexModuleFactory;
+import mx.utils.StringUtil;
import org.apache.flex.ant.Ant;
import org.apache.flex.ant.tags.supportClasses.TaskHandler;
@@ -157,6 +158,7 @@ package org.apache.flex.ant.tags
{
fs.open(sumFile, FileMode.READ);
var expected:String =
fs.readUTFBytes(fs.bytesAvailable);
+expected = StringUtil.trim(expected);
fs.close();
if (sum != expected)
context[verifyproperty != null ? verifyproperty :
property] = false;
[3/3] git commit: [flex-utilities] [refs/heads/develop] - add contains and tstamp to support timestamping urls
add contains and tstamp to support timestamping urls
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/e7db8ee8
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/e7db8ee8
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/e7db8ee8
Branch: refs/heads/develop
Commit: e7db8ee87c1cb6368ba89cd10ed01fbbb0c8149c
Parents: 9b3a6cf
Author: Alex Harui aha...@apache.org
Authored: Fri May 30 15:41:06 2014 -0700
Committer: Alex Harui aha...@apache.org
Committed: Fri May 30 15:41:06 2014 -0700
--
ant_on_air/src/AntClasses.as| 2 +
.../src/org/apache/flex/ant/tags/Contains.as| 58 +
.../src/org/apache/flex/ant/tags/TStamp.as | 67
ant_on_air/tests/test.xml | 4 ++
4 files changed, 131 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e7db8ee8/ant_on_air/src/AntClasses.as
--
diff --git a/ant_on_air/src/AntClasses.as b/ant_on_air/src/AntClasses.as
index e291943..5626ddf 100644
--- a/ant_on_air/src/AntClasses.as
+++ b/ant_on_air/src/AntClasses.as
@@ -30,6 +30,7 @@ package
import org.apache.flex.ant.tags.Available; Available;
import org.apache.flex.ant.tags.Checksum; Checksum;
import org.apache.flex.ant.tags.Condition; Condition;
+import org.apache.flex.ant.tags.Contains; Contains;
import org.apache.flex.ant.tags.Copy; Copy;
import org.apache.flex.ant.tags.Delete; Delete;
import org.apache.flex.ant.tags.Echo; Echo;
@@ -54,6 +55,7 @@ package
import org.apache.flex.ant.tags.PropertyFile; PropertyFile;
import org.apache.flex.ant.tags.Replace; Replace;
import org.apache.flex.ant.tags.Touch; Touch;
+import org.apache.flex.ant.tags.TStamp; TStamp;
import org.apache.flex.ant.tags.Untar; Untar;
import org.apache.flex.ant.tags.Unzip; Unzip;
import org.apache.flex.ant.tags.XmlProperty; XmlProperty;
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/e7db8ee8/ant_on_air/src/org/apache/flex/ant/tags/Contains.as
--
diff --git a/ant_on_air/src/org/apache/flex/ant/tags/Contains.as
b/ant_on_air/src/org/apache/flex/ant/tags/Contains.as
new file mode 100644
index 000..64f8738
--- /dev/null
+++ b/ant_on_air/src/org/apache/flex/ant/tags/Contains.as
@@ -0,0 +1,58 @@
+
+//
+// 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.
+//
+
+package org.apache.flex.ant.tags
+{
+import mx.core.IFlexModuleFactory;
+
+import org.apache.flex.ant.Ant;
+import org.apache.flex.ant.tags.supportClasses.IValueTagHandler;
+import org.apache.flex.ant.tags.supportClasses.TagHandler;
+
+[Mixin]
+public class Contains extends TagHandler implements IValueTagHandler
+{
+public static function init(mf:IFlexModuleFactory):void
+{
+Ant.antTagProcessors[contains] = Contains;
+}
+
+public function Contains()
+{
+super();
+}
+
+private function get string():String
+ {
+ return getAttributeValue(@string);
+ }
+
+private function get substring():String
+ {
+ return getAttributeValue(@substring);
+ }
+
+public function getValue(context:Object):Object
+{
+ this.context = context;
+ var pat:String = substring;
+ return string.indexOf(substring) != -1;
+}
+
+}
+}
\ No newline at end of file
[1/3] git commit: [flex-utilities] [refs/heads/develop] - break URLs into server/folder for ant caching
Repository: flex-utilities Updated Branches: refs/heads/develop 5dd10ca95 - e7db8ee87 break URLs into server/folder for ant caching Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/07b48a98 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/07b48a98 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/07b48a98 Branch: refs/heads/develop Commit: 07b48a985bb62e36ea463ca91db7c5e06ede620e Parents: 5dd10ca Author: Alex Harui aha...@apache.org Authored: Fri May 30 15:39:01 2014 -0700 Committer: Alex Harui aha...@apache.org Committed: Fri May 30 15:39:01 2014 -0700 -- .../src/installer/sdk-installer-config-4.0.xml | 96 +++- 1 file changed, 94 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/07b48a98/installer/src/installer/sdk-installer-config-4.0.xml -- diff --git a/installer/src/installer/sdk-installer-config-4.0.xml b/installer/src/installer/sdk-installer-config-4.0.xml index ff3f162..3e0c3e5 100644 --- a/installer/src/installer/sdk-installer-config-4.0.xml +++ b/installer/src/installer/sdk-installer-config-4.0.xml @@ -28,7 +28,7 @@ limitations under the License. -- config version - latest3.0.0/latest + latest3.1.0/latest /version languages locale1 id=de_DE name=Deutsch path=http://flex.apache.org/installer/properties/de_DE.properties/ @@ -87,6 +87,8 @@ limitations under the License. linux versions default=2.6 versionA id=air.sdk.version.linux.2.6 version=2.6 displayVersion=2.6 +server id=air.sdk.server.linux.2.6http://airdownload.adobe.com/server +folder id=air.sdk.folder.linux.2.6air/lin/download/2.6//folder path id=air.sdk.path.linux.2.6http://airdownload.adobe.com/air/lin/download/2.6//path file id=air.sdk.file.linux.2.6AdobeAIRSDK.tbz2/file /versionA @@ -95,64 +97,94 @@ limitations under the License. windows versions default=13.0 versionA id=air.sdk.version.windows.2.6 version=2.6 displayVersion=2.6 +server id=air.sdk.server.windows.2.6http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.2.6air/win/download/2.6//folder path id=air.sdk.path.windows.2.6http://airdownload.adobe.com/air/win/download/2.6//path file id=air.sdk.file.windows.2.6AdobeAIRSDK.zip/file /versionA versionB id=air.sdk.version.windows.2.7 version=2.7 displayVersion=2.7 +server id=air.sdk.server.windows.2.7http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.2.7air/win/download/2.7//folder path id=air.sdk.path.windows.2.7http://airdownload.adobe.com/air/win/download/2.7//path file id=air.sdk.file.windows.2.7AdobeAIRSDK.zip/file /versionB versionC id=air.sdk.version.windows.3.0 version=3.0 displayVersion=3.0 +server id=air.sdk.server.windows.3.0http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.3.0air/win/download/3.0//folder path id=air.sdk.path.windows.3.0http://airdownload.adobe.com/air/win/download/3.0//path file id=air.sdk.file.windows.3.0AdobeAIRSDK.zip/file /versionC versionD id=air.sdk.version.windows.3.1 version=3.1 displayVersion=3.1 label=tested +server id=air.sdk.server.windows.3.1http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.3.1air/win/download/3.1//folder path id=air.sdk.path.windows.3.1http://airdownload.adobe.com/air/win/download/3.1//path file id=air.sdk.file.windows.3.1AdobeAIRSDK.zip/file /versionD versionE id=air.sdk.version.windows.3.2 version=3.2 displayVersion=3.2 +server id=air.sdk.server.windows.3.2http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.3.2air/win/download/3.2//folder path id=air.sdk.path.windows.3.2http://airdownload.adobe.com/air/win/download/3.2//path file id=air.sdk.file.windows.3.2AdobeAIRSDK.zip/file /versionE versionF id=air.sdk.version.windows.3.3 version=3.3 displayVersion=3.3 +server id=air.sdk.server.windows.3.3http://airdownload.adobe.com/server +
svn commit: r1598764 - /flex/site/trunk/content/installer/sdk-installer-config-4.0.xml
Author: aharui Date: Fri May 30 22:42:53 2014 New Revision: 1598764 URL: http://svn.apache.org/r1598764 Log: add server/folder format for ant caching Modified: flex/site/trunk/content/installer/sdk-installer-config-4.0.xml Modified: flex/site/trunk/content/installer/sdk-installer-config-4.0.xml URL: http://svn.apache.org/viewvc/flex/site/trunk/content/installer/sdk-installer-config-4.0.xml?rev=1598764r1=1598763r2=1598764view=diff == --- flex/site/trunk/content/installer/sdk-installer-config-4.0.xml (original) +++ flex/site/trunk/content/installer/sdk-installer-config-4.0.xml Fri May 30 22:42:53 2014 @@ -28,7 +28,7 @@ limitations under the License. -- config version - latest3.0.0/latest + latest3.1.0/latest /version languages locale1 id=de_DE name=Deutsch path=http://flex.apache.org/installer/properties/de_DE.properties/ @@ -87,6 +87,8 @@ limitations under the License. linux versions default=2.6 versionA id=air.sdk.version.linux.2.6 version=2.6 displayVersion=2.6 +server id=air.sdk.server.linux.2.6http://airdownload.adobe.com/server +folder id=air.sdk.folder.linux.2.6air/lin/download/2.6//folder path id=air.sdk.path.linux.2.6http://airdownload.adobe.com/air/lin/download/2.6//path file id=air.sdk.file.linux.2.6AdobeAIRSDK.tbz2/file /versionA @@ -95,64 +97,94 @@ limitations under the License. windows versions default=13.0 versionA id=air.sdk.version.windows.2.6 version=2.6 displayVersion=2.6 +server id=air.sdk.server.windows.2.6http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.2.6air/win/download/2.6//folder path id=air.sdk.path.windows.2.6http://airdownload.adobe.com/air/win/download/2.6//path file id=air.sdk.file.windows.2.6AdobeAIRSDK.zip/file /versionA versionB id=air.sdk.version.windows.2.7 version=2.7 displayVersion=2.7 +server id=air.sdk.server.windows.2.7http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.2.7air/win/download/2.7//folder path id=air.sdk.path.windows.2.7http://airdownload.adobe.com/air/win/download/2.7//path file id=air.sdk.file.windows.2.7AdobeAIRSDK.zip/file /versionB versionC id=air.sdk.version.windows.3.0 version=3.0 displayVersion=3.0 +server id=air.sdk.server.windows.3.0http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.3.0air/win/download/3.0//folder path id=air.sdk.path.windows.3.0http://airdownload.adobe.com/air/win/download/3.0//path file id=air.sdk.file.windows.3.0AdobeAIRSDK.zip/file /versionC versionD id=air.sdk.version.windows.3.1 version=3.1 displayVersion=3.1 label=tested +server id=air.sdk.server.windows.3.1http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.3.1air/win/download/3.1//folder path id=air.sdk.path.windows.3.1http://airdownload.adobe.com/air/win/download/3.1//path file id=air.sdk.file.windows.3.1AdobeAIRSDK.zip/file /versionD versionE id=air.sdk.version.windows.3.2 version=3.2 displayVersion=3.2 +server id=air.sdk.server.windows.3.2http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.3.2air/win/download/3.2//folder path id=air.sdk.path.windows.3.2http://airdownload.adobe.com/air/win/download/3.2//path file id=air.sdk.file.windows.3.2AdobeAIRSDK.zip/file /versionE versionF id=air.sdk.version.windows.3.3 version=3.3 displayVersion=3.3 +server id=air.sdk.server.windows.3.3http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.3.3air/win/download/3.3//folder path id=air.sdk.path.windows.3.3http://airdownload.adobe.com/air/win/download/3.3//path file id=air.sdk.file.windows.3.3AdobeAIRSDK.zip/file /versionF versionG id=air.sdk.version.windows.3.4 version=3.4 displayVersion=3.4 label=tested +server id=air.sdk.server.windows.3.4http://airdownload.adobe.com/server +folder id=air.sdk.folder.windows.3.4air/win/download/3.4//folder path id=air.sdk.path.windows.3.4http://airdownload.adobe.com/air/win/download/3.4//path file
svn commit: r910634 - in /websites/staging/flex/trunk: cgi-bin/ content/ content/installer/sdk-installer-config-4.0.xml
Author: buildbot Date: Fri May 30 22:43:06 2014 New Revision: 910634 Log: Staging update by buildbot for flex Modified: websites/staging/flex/trunk/cgi-bin/ (props changed) websites/staging/flex/trunk/content/ (props changed) websites/staging/flex/trunk/content/installer/sdk-installer-config-4.0.xml Propchange: websites/staging/flex/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Fri May 30 22:43:06 2014 @@ -1 +1 @@ -1598322 +1598764 Propchange: websites/staging/flex/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Fri May 30 22:43:06 2014 @@ -1 +1 @@ -1598322 +1598764 Modified: websites/staging/flex/trunk/content/installer/sdk-installer-config-4.0.xml == Binary files - no diff available.
svn commit: r910635 - in /websites/production/flex: cgi-bin/ content/
Author: aharui Date: Fri May 30 22:45:57 2014 New Revision: 910635 Log: add server/folder format for ant caching Added: websites/production/flex/cgi-bin/ - copied from r910634, websites/staging/flex/trunk/cgi-bin/ websites/production/flex/content/ - copied from r910634, websites/staging/flex/trunk/content/
Jenkins build is still unstable: flex-falcon #66
See http://apacheflexbuild.cloudapp.net:8080/job/flex-falcon/changes
Build failed in Jenkins: flex-asjs #95
See http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/95/ -- [...truncated 133 lines...] air-config: [copy] Copying 1 file to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/frameworks stage-source-no-scripts: clean-temp: [copy] Copying 11 files to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp stage-framework-as: [copy] Copying 342 files to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp/frameworks/as [echo] Updating config file air-config.xml with version 0.0.2.20140531 [echo] Updating config file flex-config.xml with version 0.0.2.20140531 stage-framework-js: [copy] Copying 153 files to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp/frameworks/js/FlexJS/src [copy] Copying 2 files to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp/frameworks/js [copy] Copying 1 file to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp/asdoc [copy] Copying 2 files to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp/ide [copy] Copying 4 files to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp/js/bin [copy] Copying 176 files to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp/examples stage-source: stage-scripts: [copy] Copying 4 files to http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/temp/scripts source-package-zip: [mkdir] Created dir: http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/out [zip] Building zip: http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/95/artifact/out/apache-flex-flexjs-0.0.2-src.zip source-package-tgz: [tar] Building tar: http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/95/artifact/out/apache-flex-flexjs-0.0.2-src.tar.gz source-package: source-release: setup-binary-release: thirdparty-downloads: thirdparty-downloads: swfobject-check: swfobject-download: main: [echo] Use thirdparty-clean or super-clean to remove these. thirdparty-downloads: prebuild: frameworks-as: check-compile-env: check-playerglobal-home: check-air-home: check-flex-home: check-falcon-home: check-falconjx-home: check-compile-env: [echo] OS: Windows Server 2008 R2 / 6.1 / amd64 [echo] VM: Java HotSpot(TM) 64-Bit Server VM / 24.55-b03 [echo] Java: 1.7.0_55 [echo] Ant: Apache Ant(TM) version 1.9.3 compiled on December 23 2013 Ant Java Version: 1.7 clean: clean: clean: thirdparty-downloads: swfobject-check: swfobject-download: main: [echo] Use thirdparty-clean or super-clean to remove these. prepare: compile: flexjsui: clean: compile: [echo] Compiling libs/FlexJSUI.swc [echo] FLEX_HOME: C:\Jenkins\workspace\flex-sdk [echo] FALCON_HOME: c:\Jenkins\workspace\flex-falcon\compiler\generated\dist\sdk [compc] Loading configuration: http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/frameworks/as/projects/FlexJSUI/compile-config.xml [compc] [compc] 297020 bytes written to C:\Jenkins\workspace\flex-asjs\frameworks\as\libs\FlexJSUI.swc in 23.957 seconds test: [available] DEPRECATED - available used to override an existing property. [available] Build file should not reuse the same property name for different values. clean: compile: [echo] Compiling FlexUnitFlexJSApplication.swf [echo] FLEX_HOME: C:\Jenkins\workspace\flex-sdk [echo] FALCON_HOME: c:\Jenkins\workspace\flex-falcon\compiler\generated\dist\sdk [echo] FLEXUNIT_HOME: C:\jenkins\workspace\flex-flexunit [mxmlc] Loading configuration: C:\Jenkins\workspace\flex-sdk\frameworks\flex-config.xml [mxmlc] [mxmlc] 152541 bytes written to C:\Jenkins\workspace\flex-asjs\frameworks\as\projects\FlexJSUI\tests\FlexUnitFlexJSApplication.swf in 16.754 seconds test: [flexunit] Validating task attributes ... [flexunit] Generating default values ... [flexunit] Using the following settings for the test run: [flexunit] FLEX_HOME: [C:\Jenkins\workspace\flex-sdk] [flexunit] haltonfailure: [false] [flexunit] headless: [false] [flexunit] display: [99] [flexunit] localTrusted: [true] [flexunit] player: [flash] [flexunit] command: [C:\Program Files (x86)\Mozilla Firefox\firefox.exe] [flexunit] port: [1024] [flexunit] swf: [http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/frameworks/as/projects/FlexJSUI/tests/FlexUnitFlexJSApplication.swf] [flexunit] timeout: [6ms] [flexunit] toDir: [http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/frameworks/as/projects/FlexJSUI/tests/out] [flexunit] Setting up server process ... [flexunit] Entry [http://apacheflexbuild.cloudapp.net:8080/job/flex-asjs/ws/frameworks/as/projects/FlexJSUI/tests] already available in local trust file at [C:\Users\apacheflexbuild\AppData\Roaming\Macromedia\Flash Player\#Security\FlashPlayerTrust\flexUnit.cfg]. [flexunit]
