[36/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/Destination.java
--
diff --git a/core/src/flex/messaging/Destination.java
b/core/src/flex/messaging/Destination.java
deleted file mode 100644
index 312e371..000
--- a/core/src/flex/messaging/Destination.java
+++ /dev/null
@@ -1,802 +0,0 @@
-/*
- * 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 flex.messaging;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import flex.management.ManageableComponent;
-import flex.management.runtime.messaging.services.ServiceControl;
-import flex.messaging.log.LogCategories;
-import flex.messaging.log.Log;
-import flex.messaging.services.Service;
-import flex.messaging.services.ServiceAdapter;
-import flex.messaging.util.ClassUtil;
-import flex.messaging.cluster.ClusterManager;
-import flex.messaging.config.ClusterSettings;
-import flex.messaging.config.ConfigMap;
-import flex.messaging.config.ConfigurationConstants;
-import flex.messaging.config.ConfigurationException;
-import flex.messaging.config.NetworkSettings;
-import flex.messaging.config.SecurityConstraint;
-/**
- * The Destination class is a source and sink for messages sent
through
- * a service destination and uses an adapter to process messages.
- */
-public class Destination extends ManageableComponent implements
java.io.Serializable
-{
-static final long serialVersionUID = -977001797620881435L;
-
-/** Default log category for Destination. */
-public static final String LOG_CATEGORY = LogCategories.SERVICE_GENERAL;
-
-/** Hard coded id for the push destination */
-public static final String PUSH_DESTINATION_ID = "_DS_PUSH_";
-
-// Errors
-private static final int NO_SERVICE = 7;
-
-// Destination's properties
-protected ServiceAdapter adapter;
-protected List channelIds;
-protected NetworkSettings networkSettings;
-protected SecurityConstraint securityConstraint;
-protected String securityConstraintRef;
-protected HashMap extraProperties;
-protected boolean initialized;
-protected boolean clustered;
-protected boolean clusteredCalculated;
-
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Constructs an unmanaged Destination instance.
- */
-public Destination()
-{
-this(false);
-}
-
-/**
- * Constructs a Destination with the indicated management.
- *
- * @param enableManagement true if the
Destination
- * is manageable; otherwise false.
- */
-public Destination(boolean enableManagement)
-{
-super(enableManagement);
-
-networkSettings = new NetworkSettings();
-}
-
-
//--
-//
-// Initialize, validate, start, and stop methods.
-//
-
//--
-
-/**
- * Initializes the Destination with the properties.
- * If subclasses override, they must call super.initialize().
- *
- * @param id The id of the destination.
- * @param properties Properties for the destination.
- */
-@Override
-public void initialize(String id, ConfigMap properties)
-{
-super.initialize(id, properties);
-
-if (properties == null || properties.size() == 0)
-{
-initialized = true;
-return;
-}
-
-ConfigMap network =
properties.getPropertyAsMap(NetworkSettings.NETWORK_ELEMENT, null);
-
-if (network != null)
-{
-
networkSettings.setReliable(network.getPropertyAsBoolean(NetworkSettings.RELIABLE_ELEMENT,
false));
-
-ConfigMap clusterInfo =
network.getPropertyAsMap(ClusterSettings.CLUSTER_ELEMENT, null);
-if (clusterInfo != null)
-{
-// Mark these as used so we do not get warnings about them.
-
[51/51] [partial] flex-blazeds git commit: - Major code scrub
- Major code scrub Project: http://git-wip-us.apache.org/repos/asf/flex-blazeds/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-blazeds/commit/8315f8fa Tree: http://git-wip-us.apache.org/repos/asf/flex-blazeds/tree/8315f8fa Diff: http://git-wip-us.apache.org/repos/asf/flex-blazeds/diff/8315f8fa Branch: refs/heads/develop Commit: 8315f8faf8cd796583ac9249f6d0aeb6bad71214 Parents: 2b91915 Author: Christofer Dutz Authored: Wed Feb 15 23:42:26 2017 +0100 Committer: Christofer Dutz Committed: Wed Feb 15 23:42:29 2017 +0100 -- common/pom.xml | 63 +- common/src/flex/graphics/ImageSnapshot.java | 147 -- common/src/flex/graphics/package-info.java | 18 - .../src/flex/messaging/LocalizedException.java | 378 --- .../config/AbstractConfigurationParser.java | 556 - .../flex/messaging/config/AdapterSettings.java | 125 - .../ApacheXPathClientConfigurationParser.java | 86 - .../flex/messaging/config/ChannelSettings.java | 334 --- .../messaging/config/ClientConfiguration.java | 192 -- .../config/ClientConfigurationParser.java | 951 .../flex/messaging/config/ClusterSettings.java | 152 -- common/src/flex/messaging/config/ConfigMap.java | 469 .../config/ConfigurationConstants.java | 467 .../config/ConfigurationException.java | 36 - .../config/ConfigurationFileResolver.java | 32 - .../messaging/config/ConfigurationParser.java | 30 - .../messaging/config/DestinationSettings.java | 188 -- .../messaging/config/FlexClientSettings.java| 134 -- .../messaging/config/LocalFileResolver.java | 203 -- .../flex/messaging/config/LoggingSettings.java | 46 - .../messaging/config/LoginCommandSettings.java | 101 - .../messaging/config/PropertiesSettings.java| 99 - .../messaging/config/SecurityConstraint.java| 123 - .../flex/messaging/config/ServiceSettings.java | 165 -- .../messaging/config/ServicesConfiguration.java | 70 - .../messaging/config/ServicesDependencies.java | 747 -- .../flex/messaging/config/TargetSettings.java | 78 - .../flex/messaging/config/TokenReplacer.java| 202 -- .../config/XPathClientConfigurationParser.java | 89 - common/src/flex/messaging/errors.properties | 432 .../src/flex/messaging/log/AbstractTarget.java | 272 --- .../src/flex/messaging/log/ConsoleTarget.java | 42 - .../flex/messaging/log/LineFormattedTarget.java | 286 --- common/src/flex/messaging/log/Log.java | 708 -- .../src/flex/messaging/log/LogCategories.java | 112 - common/src/flex/messaging/log/LogEvent.java | 116 - common/src/flex/messaging/log/Logger.java | 402 common/src/flex/messaging/log/Target.java | 112 - .../flex/messaging/util/BasicPrettyPrinter.java | 164 -- .../src/flex/messaging/util/ExceptionUtil.java | 250 -- common/src/flex/messaging/util/FileUtils.java | 96 - common/src/flex/messaging/util/LocaleUtils.java | 58 - common/src/flex/messaging/util/ObjectTrace.java | 175 -- .../flex/messaging/util/PrettyPrintable.java| 30 - .../src/flex/messaging/util/PrettyPrinter.java | 30 - .../util/PropertyStringResourceLoader.java | 378 --- .../src/flex/messaging/util/ResourceLoader.java | 104 - common/src/flex/messaging/util/StringUtils.java | 214 -- common/src/flex/messaging/util/UUIDUtils.java | 330 --- .../main/java/flex/graphics/ImageSnapshot.java | 147 ++ .../main/java/flex/graphics/package-info.java | 18 + .../java/flex/messaging/LocalizedException.java | 378 +++ .../config/AbstractConfigurationParser.java | 556 + .../flex/messaging/config/AdapterSettings.java | 125 + .../ApacheXPathClientConfigurationParser.java | 86 + .../flex/messaging/config/ChannelSettings.java | 334 +++ .../messaging/config/ClientConfiguration.java | 192 ++ .../config/ClientConfigurationParser.java | 951 .../flex/messaging/config/ClusterSettings.java | 152 ++ .../java/flex/messaging/config/ConfigMap.java | 469 .../config/ConfigurationConstants.java | 467 .../config/ConfigurationException.java | 36 + .../config/ConfigurationFileResolver.java | 32 + .../messaging/config/ConfigurationParser.java | 30 + .../messaging/config/DestinationSettings.java | 188 ++ .../messaging/config/FlexClientSettings.java| 134 ++ .../messaging/config/LocalFileResolver.java | 203 ++ .../flex/messaging/config/LoggingSettings.java | 46 + .../messaging/config/LoginCommandSettings.java | 101 + .../messaging/config/PropertiesSettings.java| 99 + .../messaging/config/SecurityConstraint.java| 123 + .../flex/messaging/config/ServiceSettings.java | 165 ++ .../messaging/config/ServicesConfiguration.java | 70 + .../messaging/config/ServicesDependencies.java | 747 ++ .../fl
[42/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/main/java/flex/messaging/log/LineFormattedTarget.java
--
diff --git a/common/src/main/java/flex/messaging/log/LineFormattedTarget.java
b/common/src/main/java/flex/messaging/log/LineFormattedTarget.java
new file mode 100644
index 000..1864bb0
--- /dev/null
+++ b/common/src/main/java/flex/messaging/log/LineFormattedTarget.java
@@ -0,0 +1,286 @@
+/*
+ * 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 flex.messaging.log;
+
+import flex.messaging.config.ConfigMap;
+import flex.messaging.util.ExceptionUtil;
+import flex.messaging.util.StringUtils;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ *
+ */
+public class LineFormattedTarget extends AbstractTarget
+{
+/**
+ * Indicates if the date should be added to the trace.
+ */
+protected boolean includeDate;
+
+/**
+ * Indicates if the time should be added to the trace.
+ */
+protected boolean includeTime;
+
+/**
+ * Indicates if the level for the event should added to the trace.
+ */
+protected boolean includeLevel;
+
+/**
+ * Indicates if the category for this target should added to the trace.
+ */
+protected boolean includeCategory;
+
+/**
+ * A prefix to prepend onto each logged message.
+ */
+protected String prefix = null;
+
+/**
+ * The formatter to write the date as part of the logging statement.
+ * Defaults to MM/dd/ format.
+ */
+protected DateFormat dateFormater = new SimpleDateFormat("MM/dd/");
+
+/**
+ * The formatter to write the time as part of the logging statement.
+ * Defaults to HH:mm:ss.SSS format.
+ */
+protected DateFormat timeFormatter = new SimpleDateFormat("HH:mm:ss.SSS");
+
+
//--
+//
+// Constructor
+//
+
//--
+
+/**
+ * Default constructor.
+ */
+public LineFormattedTarget()
+{
+super();
+}
+
+
//--
+//
+// Initialize, validate, start, and stop methods.
+//
+
//--
+
+/**
+ * Initializes the target with id and properties. Subclasses can overwrite.
+ *
+ * @param id id for the target which is ignored.
+ * @param properties ConfigMap of properties for the target.
+ */
+public void initialize(String id, ConfigMap properties)
+{
+super.initialize(id, properties);
+
+includeTime = properties.getPropertyAsBoolean("includeTime", false);
+includeDate = properties.getPropertyAsBoolean("includeDate", false);
+includeCategory = properties.getPropertyAsBoolean("includeCategory",
false);
+includeLevel = properties.getPropertyAsBoolean("includeLevel", false);
+prefix = properties.getPropertyAsString("prefix", null);
+}
+
+
//--
+//
+// Public Getters and Setters for AbstractService properties
+//
+
//--
+
+/**
+ * Returns includeCategory property.
+ *
+ * @return true if category is included; false
otherwise.
+ */
+public boolean isIncludeCategory()
+{
+return includeCategory;
+}
+
+/**
+ * Sets includeCategory property.
+ *
+ * @param includeCategory the include category
+ */
+public void setIncludeCategory(boolean includeCategory)
+{
+this.includeCategory = includeCategory;
+}
+
+/**
+ * Returns includeDate property.
+ *
+ * @return true if date is included; false
otherwise.
+ */
+public boolean isIncludeDate()
+{
+return includeDate;
+}
+
+/**
+ * Sets includeDate property.
+ *
+ * @param includeDate the include date
+ */
+pu
[20/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/PropertyProxy.java
--
diff --git a/core/src/flex/messaging/io/PropertyProxy.java
b/core/src/flex/messaging/io/PropertyProxy.java
deleted file mode 100644
index 02513f6..000
--- a/core/src/flex/messaging/io/PropertyProxy.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * 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 flex.messaging.io;
-
-import java.util.List;
-
-/**
- * A PropertyProxy allows customized serialization and deserialization of
complex objects by
- * providing access to each of the steps in the serialization and
deserialization process.
- * A serializer asks a PropertyProxy for the class name, traits
- * and properties during serialization. A deserializer asks a PropertyProxy
- * to create a new instance and set property values.
- *
- * Different PropertyProxy implementations may be written for different
- * types of objects such as Map, Dictionary, Enumerable, Throwable,
- * and Beans.
- */
-public interface PropertyProxy extends Cloneable
-{
-/**
- * The default instance managed by this PropertyProxy. The
- * default instance is used for one-type proxied instances.
- *
- * @return The proxied instance.
- */
-Object getDefaultInstance();
-
-/**
- * Sets the default instance managed by this PropertyProxy.
- *
- * @param defaultInstance The default instance.
- */
-void setDefaultInstance(Object defaultInstance);
-
-/**
- * Creates a new instance for the given className. ClassName is the
- * value of the "alias" for the ActionScript class serialized.
- * If the className is invalid an anonymous ASObject is created. If the
className is
- * prefixed with ">" an ASObject is created with the type set however
- * a concrete instance is not instantiated.
- * @param className the class to create
- * @return an instance of className
- */
-Object createInstance(String className);
-
-/**
- * The List of property names as Strings that make up the traits
- * of the default instance. These traits determine which properties
- * are to be serialized.
- *
- * @return The set of property names as Strings to be serialized.
- */
-List getPropertyNames();
-
-/**
- * The List of property names as Strings that make up the traits
- * of the given instance. These traits determine which properties
- * are to be serialized.
- *
- * @param instance the object to examine
- * @return List of property names as Strings to be serialized.
- */
-List getPropertyNames(Object instance);
-
-/**
- * Looks up the Class type of the property by name on the default instance.
- * @param propertyName The name of the property.
- * @return The property type.
- */
-Class getType(String propertyName);
-
-/**
- * Looks up the Class type of the property by name on the given instance.
- * @param instance The instance that possesses the property.
- * @param propertyName The name of the property.
- * @return The property type.
- */
-Class getType(Object instance, String propertyName);
-
-/**
- * Looks up the value of the property by name from the default
- * instance.
- *
- * @param propertyName The name of the property.
- * @return The value of the given property.
- */
-Object getValue(String propertyName);
-
-/**
- * Looks up the value of a property by name for the given instance.
- *
- * @param instance The instance that possesses the requested property.
- * @param propertyName The name of the property.
- * @return The value of the given property.
- */
-Object getValue(Object instance, String propertyName);
-
-/**
- * Updates the value of a propery by name for the default instance.
- *
- * @param propertyName the property name
- * @param value the new value
- */
-void setValue(String propertyName, Object value);
-
-/**
- * Updates the value of a property by name for the given instance.
- *
-
[17/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amf/AmfMessageDeserializer.java
--
diff --git a/core/src/flex/messaging/io/amf/AmfMessageDeserializer.java
b/core/src/flex/messaging/io/amf/AmfMessageDeserializer.java
deleted file mode 100644
index 2cc5287..000
--- a/core/src/flex/messaging/io/amf/AmfMessageDeserializer.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * 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 flex.messaging.io.amf;
-
-import flex.messaging.MessageException;
-import flex.messaging.io.MessageDeserializer;
-import flex.messaging.io.MessageIOConstants;
-import flex.messaging.io.RecoverableSerializationException;
-import flex.messaging.io.SerializationContext;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class AmfMessageDeserializer implements MessageDeserializer
-{
-public static final String CODE_VERSION_MISMATCH = "VersionMismatch";
-private static final int UNSUPPORTED_AMF_VERSION = 10310;
-
-protected ActionMessageInput amfIn;
-
-protected AmfTrace debugTrace;
-protected boolean isDebug;
-
-public AmfMessageDeserializer()
-{
-}
-
-public void initialize(SerializationContext context, InputStream in,
AmfTrace trace)
-{
-amfIn = new Amf0Input(context);
-amfIn.setInputStream(in);
-
-debugTrace = trace;
-isDebug = debugTrace != null;
-amfIn.setDebugTrace(debugTrace);
-}
-
-public void readMessage(ActionMessage m, ActionContext context) throws
ClassNotFoundException, IOException
-{
-if (isDebug)
-debugTrace.startRequest("Deserializing AMF/HTTP request");
-
-int version = amfIn.readUnsignedShort();
-
-// Treat FMS's AMF1 as AMF0.
-if (version == MessageIOConstants.AMF1)
-version = MessageIOConstants.AMF0;
-
-if (version != MessageIOConstants.AMF0 && version !=
MessageIOConstants.AMF3)
-{
-//Unsupported AMF version {version}.
-MessageException ex = new MessageException();
-ex.setMessage(UNSUPPORTED_AMF_VERSION, new Object[] {new
Integer(version)});
-ex.setCode(CODE_VERSION_MISMATCH);
-throw ex;
-}
-
-m.setVersion(version);
-context.setVersion(version);
-
-if (isDebug)
-debugTrace.version(version);
-
-// Read headers
-int headerCount = amfIn.readUnsignedShort();
-for (int i = 0; i < headerCount; ++i)
-{
-MessageHeader header = new MessageHeader();
-m.addHeader(header);
-readHeader(header, i);
-}
-
-// Read bodies
-int bodyCount = amfIn.readUnsignedShort();
-for (int i = 0; i < bodyCount; ++i)
-{
-MessageBody body = new MessageBody();
-m.addBody(body);
-readBody(body, i);
-}
-}
-
-
-/**
- * Deserialize a message header from the input stream.
- * A message header is structured as:
- * NAME kString
- * MUST UNDERSTAND kBoolean
- * LENGTH kInt
- * DATA kObject
- *
- * @param header - will hold the deserialized message header
- * @param index header index for debugging
- * @throws IOException thrown by the underlying stream
- * @throws ClassNotFoundException if we don't find the class for the
header data.
- */
-public void readHeader(MessageHeader header, int index) throws
ClassNotFoundException, IOException
-{
-String name = amfIn.readUTF();
-header.setName(name);
-boolean mustUnderstand = amfIn.readBoolean();
-header.setMustUnderstand(mustUnderstand);
-
-amfIn.readInt(); // Length
-
-amfIn.reset();
-Object data;
-
-if (isDebug)
-debugTrace.startHeader(name, mustUnderstand, index);
-
-try
-{
-data = readObject();
-}
-catch (RecoverableSerializationException ex)
-{
-ex.setCode("Client.Header.Encoding");
-data = ex;
-}
-catch (MessageException ex)
-
[18/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amf/Amf3Input.java
--
diff --git a/core/src/flex/messaging/io/amf/Amf3Input.java
b/core/src/flex/messaging/io/amf/Amf3Input.java
deleted file mode 100644
index 0e62b88..000
--- a/core/src/flex/messaging/io/amf/Amf3Input.java
+++ /dev/null
@@ -1,1045 +0,0 @@
-/*
- * 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 flex.messaging.io.amf;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Dictionary;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import flex.messaging.io.PropertyProxy;
-import flex.messaging.io.SerializationContext;
-import flex.messaging.io.SerializationException;
-import flex.messaging.io.UnknownTypeException;
-import flex.messaging.io.amf.AmfTrace.VectorType;
-import flex.messaging.util.ClassUtil;
-import flex.messaging.util.Trace;
-
-/**
- * Reads AMF 3 formatted data stream.
- *
- * This class intends to matches the Flash Player 8 C++ code
- * in avmglue/DataIO.cpp
- *
- *
- *
- */
-public class Amf3Input extends AbstractAmfInput implements Amf3Types
-{
-/**
- *
- */
-protected List objectTable;
-
-/**
- *
- */
-protected List stringTable;
-
-/**
- *
- */
-protected List traitsTable;
-
-public Amf3Input(SerializationContext context)
-{
-super(context);
-
-stringTable = new ArrayList(64);
-objectTable = new ArrayList(64);
-traitsTable = new ArrayList(10);
-}
-
-/**
- * Reset should be called before reading a top level object,
- * such as a new header or a new body.
- */
-@Override
-public void reset()
-{
-super.reset();
-stringTable.clear();
-objectTable.clear();
-traitsTable.clear();
-}
-
-public Object saveObjectTable()
-{
-Object table = objectTable;
-objectTable = new ArrayList(64);
-return table;
-}
-
-public void restoreObjectTable(Object table)
-{
-objectTable = (ArrayList) table;
-}
-
-public Object saveTraitsTable()
-{
-Object table = traitsTable;
-traitsTable = new ArrayList(10);
-return table;
-}
-
-public void restoreTraitsTable(Object table)
-{
-traitsTable = (ArrayList) table;
-}
-
-public Object saveStringTable()
-{
-Object table = stringTable;
-stringTable = new ArrayList(64);
-return table;
-}
-
-public void restoreStringTable(Object table)
-{
-stringTable = (ArrayList) table;
-}
-
-/**
- * Public entry point to read a top level AMF Object, such as
- * a header value or a message body.
- * @return Object the object read
- * @throws ClassNotFoundException, IOException when reading object process
failed
- */
-public Object readObject() throws ClassNotFoundException, IOException
-{
-int type = in.readByte();
-Object value = readObjectValue(type);
-return value;
-}
-
-/**
- *
- */
-protected Object readObjectValue(int type) throws ClassNotFoundException,
IOException
-{
-Object value = null;
-
-switch (type)
-{
-case kStringType:
-ClassUtil.validateCreation(String.class);
-
-value = readString();
-if (isDebug)
-trace.writeString((String)value);
-break;
-
-case kObjectType:
-value = readScriptObject();
-break;
-
-case kArrayType:
-value = readArray();
-break;
-
-case kFalseType:
-ClassUtil.validateCreation(Boolean.class);
-
-value = Boolean.FALSE;
-
-if (isDebug)
-trace.write(value);
-break;
-
-case kTrueType:
-ClassUtil.val
[23/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/endpoints/Endpoint.java
--
diff --git a/core/src/flex/messaging/endpoints/Endpoint.java
b/core/src/flex/messaging/endpoints/Endpoint.java
deleted file mode 100644
index 3e1f7de..000
--- a/core/src/flex/messaging/endpoints/Endpoint.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * 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 flex.messaging.endpoints;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import flex.management.Manageable;
-import flex.messaging.MessageBroker;
-import flex.messaging.config.ConfigMap;
-import flex.messaging.config.SecurityConstraint;
-
-/**
- * An endpoint receives messages from clients and decodes them,
- * then sends them on to a MessageBroker for routing to a service.
- * The endpoint also encodes messages and delivers them to clients.
- * Endpoints are specific to a message format and network transport,
- * and are defined by the named URI path on which they are located.
- */
-public interface Endpoint extends Manageable
-{
-/**
- * Initializes the endpoint with an ID and properties.
- *
- * @param id The ID of the endpoint.
- * @param properties Properties of the endpoint.
- */
-void initialize(String id, ConfigMap properties);
-
-/**
- * Start the endpoint. The MethodBroker invokes this
- * method in order to set the endpoint up for sending and receiving
- * messages from Flash clients.
- *
- */
-void start();
-
-/**
- * Determines whether the endpoint is started.
- *
- * @return true if the endpoint is started;
false otherwise.
- */
-boolean isStarted();
-
-/**
- * Stop and destroy the endpoint. The MethodBroker invokes
- * this method in order to stop the endpoint from sending
- * and receiving messages from Flash clients.
- *
- */
-void stop();
-
-/**
- * Retrieves the corresponding client channel type for the endpoint.
- *
- * @return The corresponding client channel type for the endpoint.
- */
-String getClientType();
-
-/**
- * Sets the corresponding client channel type for the endpoint.
- *
- * @param clientType The corresponding client channel type for the
endpoint.
- */
-void setClientType(String clientType);
-
-/**
- * Retrieves the endpoint properties the client needs.
- * @return The endpoint properties the client needs.
- */
-ConfigMap describeEndpoint();
-
-/**
- * All endpoints are referenceable by an ID that is unique among
- * all the endpoints registered to a single broker instance.
- * @return The endpoint ID.
- */
-String getId();
-
-/**
- * All endpoints are referenceable by an ID that is unique among
- * all the endpoints registered to a single broker instance. The id
- * is set through this method, usually through parsed configuration.
- *
- * @param id The endpoint ID.
- */
-void setId(String id);
-
-/**
- * All endpoints must be managed by a single MessageBroker,
- * and must be capable of returning a reference to that broker.
- * This broker reference is used when the endpoint wishes to
- * send a message to one of the broker's services.
- *
- * @return broker The MessageBroker instance which manages this endpoint.
- */
-MessageBroker getMessageBroker();
-
-/**
- * Sets the MessageBroker of the endpoint.
- *
- * @param broker the message broker object
- */
-void setMessageBroker(MessageBroker broker);
-
-/**
- * Retrieves the highest messaging version currently available via this
- * endpoint.
- * @return The messaging version number.
- */
-double getMessagingVersion();
-
-
-String getParsedUrl(String contextPath);
-
-/**
- * Retrieves the port of the URL of the endpoint.
- *
- * @return The port of the URL of the endpoint.
- */
-int getPort();
-
-/**
- * Spec
[32/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/MessageException.java
--
diff --git a/core/src/flex/messaging/MessageException.java
b/core/src/flex/messaging/MessageException.java
deleted file mode 100644
index f3b565a..000
--- a/core/src/flex/messaging/MessageException.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * 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 flex.messaging;
-
-import java.util.Map;
-
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-import flex.messaging.log.LogEvent;
-import flex.messaging.messages.ErrorMessage;
-import flex.messaging.messages.Message;
-import flex.messaging.util.ExceptionUtil;
-import flex.messaging.util.PropertyStringResourceLoader;
-import flex.messaging.util.ResourceLoader;
-import flex.messaging.util.StringUtils;
-
-/**
- * The MessageException class is the basic exception type used throughout
- * the server. This class is extended to support more specific exception
types.
- */
-public class MessageException extends LocalizedException
-{
-
//--
-//
-// Static Constants
-//
-
//--
-
-// Message exception code strings.
-public static final String CODE_SERVER_RESOURCE_UNAVAILABLE =
"Server.ResourceUnavailable";
-
-
-static final long serialVersionUID = 3310842114461162689L;
-
-
//--
-//
-// Constructors
-//
-
//--
-
-/**
- * Default constructor.
- */
-public MessageException()
-{
-}
-
-/**
- * Construct a message specifying a ResourceLoader to be used to load
localized strings.
- *
- * @param loader
- */
-public MessageException(ResourceLoader loader)
-{
-super(loader);
-}
-
-/**
- * Constructor with a message.
- *
- * @param message The detailed message for the exception.
- */
-public MessageException(String message)
-{
-setMessage(message);
-}
-
-/**
- * Constructs a new exception with the specified message and the
Throwable as the root cause.
- *
- * @param message The detailed message for the exception.
- * @param t The root cause of the exception.
- */
-public MessageException(String message, Throwable t)
-{
-setMessage(message);
-setRootCause(t);
-}
-
-/**
- * Constructs a new exception with the specified Throwable as
the root cause.
- *
- * @param t The root cause of the exception.
- */
-public MessageException(Throwable t)
-{
-String rootMessage = t.getMessage();
-if (rootMessage == null)
-rootMessage = t.toString();
-setMessage(rootMessage);
-setRootCause(t);
-}
-
-
//--
-//
-// Properties
-//
-
//--
-
-//--
-// code
-//--
-
-
-protected String code;
-
-/**
- * Returns the code of the exception.
- *
- * @return Code of the exception.
- */
-public String getCode()
-{
-return code;
-}
-
-/**
- * Sets the code of the exception.
- *
- * @param code Code of the exception.
- */
-public void setCode(String code)
-{
-this.code = code;
-}
-
-//--
-// defaultLogMessageIntro
-//--
-
-/**
- * Returns the default initial text for use in the log output generated by
logAtHingePoint().
- *
- * @return the default initial text for use in the log output generated by
logAtHingePoint().
- */
-public String getDefaultLogMessageIntro()
-{
-return "Error handling message: ";
-}
-
-
[07/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java
--
diff --git
a/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java
b/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java
deleted file mode 100644
index 644771a..000
---
a/core/src/flex/messaging/services/messaging/adapters/MessagingSecurityConstraintManager.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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 flex.messaging.services.messaging.adapters;
-
-import flex.messaging.FlexContext;
-import flex.messaging.MessageBroker;
-import flex.messaging.config.ConfigurationConstants;
-import flex.messaging.config.ConfigMap;
-import flex.messaging.config.SecurityConstraint;
-import flex.messaging.config.SecuritySettings;
-import flex.messaging.security.LoginManager;
-import flex.messaging.security.SecurityException;
-
-/**
- * Messaging security constraint managers are used by messaging destinations
- * to assert authorization of send and subscribe operations.
- */
-public final class MessagingSecurityConstraintManager
-{
-public static final String SEND_SECURITY_CONSTRAINT =
"send-security-constraint";
-public static final String SUBSCRIBE_SECURITY_CONSTRAINT =
"subscribe-security-constraint";
-
-private static final int NO_SEC_CONSTRAINT = 10062;
-
-private LoginManager loginManager;
-private SecuritySettings securitySettings;
-
-private SecurityConstraint sendConstraint;
-private SecurityConstraint subscribeConstraint;
-
-/**
- * Creates a new MessagingSecurityConstraintManager instance.
- *
- * @param broker Associated MessageBroker.
- */
-public MessagingSecurityConstraintManager(MessageBroker broker)
-{
-this.loginManager = broker.getLoginManager();
-this.securitySettings = broker.getSecuritySettings();
-}
-
-/**
- * Sets the send constraint which is used when to assert authorization when
- * sending a message.
- *
- * @param ref The reference id of the constraint
- */
-public void setSendConstraint(String ref)
-{
-validateConstraint(ref);
-sendConstraint = securitySettings.getConstraint(ref);
-}
-
-/**
- * Sets the subscribe constraint which is used to assert authorization in
- * subscribe, multi-subscribe, and unsubscribe operations.
- *
- * @param ref The reference id of the constraint
- */
-public void setSubscribeConstraint(String ref)
-{
- validateConstraint(ref);
- subscribeConstraint = securitySettings.getConstraint(ref);
-}
-
-/**
- *
- * Asserts send authorizations.
- */
-public void assertSendAuthorization()
-{
-checkConstraint(sendConstraint);
-}
-
-/**
- *
- * Asserts subscribe authorizations.
- */
-public void assertSubscribeAuthorization()
-{
-checkConstraint(subscribeConstraint);
-}
-
-/**
- *
- * Creates security constraints from the given server settings.
- *
- * @param serverSettings The ConfigMap of server settings.
- */
-public void createConstraints(ConfigMap serverSettings)
-{
-// Send constraint
-ConfigMap send =
serverSettings.getPropertyAsMap(SEND_SECURITY_CONSTRAINT, null);
-if (send != null)
-{
-String ref =
send.getPropertyAsString(ConfigurationConstants.REF_ATTR, null);
-createSendConstraint(ref);
-}
-
-// Subscribe constraint
-ConfigMap subscribe =
serverSettings.getPropertyAsMap(SUBSCRIBE_SECURITY_CONSTRAINT, null);
-if (subscribe != null)
-{
-String ref =
subscribe.getPropertyAsString(ConfigurationConstants.REF_ATTR, null);
-createSubscribeConstraint(ref);
-}
-}
-
-void createSendConstraint(String ref)
-{
-if (ref != null)
-sendConstraint = securitySettings.getConstraint(ref);
-}
-
-void createSubscribeConstraint(String ref
[08/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/services/messaging/adapters/JMSProducer.java
--
diff --git
a/core/src/flex/messaging/services/messaging/adapters/JMSProducer.java
b/core/src/flex/messaging/services/messaging/adapters/JMSProducer.java
deleted file mode 100644
index 557163c..000
--- a/core/src/flex/messaging/services/messaging/adapters/JMSProducer.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * 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 flex.messaging.services.messaging.adapters;
-
-import flex.messaging.MessageException;
-import flex.messaging.config.ConfigurationException;
-import flex.messaging.log.Log;
-import flex.messaging.messages.MessagePerformanceUtils;
-
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.naming.NamingException;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * A JMSProxy subclass for javax.jms.MessageProducer instances.
- *
- *
- */
-public abstract class JMSProducer extends JMSProxy
-{
-/* JMS related variables */
-protected MessageProducer producer;
-
-protected int deliveryMode;
-protected int messagePriority;
-protected String messageType;
-
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Create a new JMSProducer with default delivery mode of
javax.jms.Message.DEFAULT_DELIVERY_MODE
- * and default message priority of
javax.jms.Message.DEFAULT_PRIORITY.
- */
-public JMSProducer()
-{
-super();
-deliveryMode = javax.jms.Message.DEFAULT_DELIVERY_MODE;
-messagePriority = javax.jms.Message.DEFAULT_PRIORITY;
-}
-
-
//--
-//
-// Initialize, validate, start, and stop methods.
-//
-
//--
-
-/**
- * Initialize with settings from the JMS adapter.
- *
- * @param settings JMS settings to use for initialization.
- */
-public void initialize(JMSSettings settings)
-{
-super.initialize(settings);
-
-String deliveryString = settings.getDeliveryMode();
-if (deliveryString.equals(JMSConfigConstants.DEFAULT_DELIVERY_MODE))
-deliveryMode = javax.jms.Message.DEFAULT_DELIVERY_MODE;
-else if (deliveryString.equals(JMSConfigConstants.PERSISTENT))
-deliveryMode = javax.jms.DeliveryMode.PERSISTENT;
-else if (deliveryString.equals(JMSConfigConstants.NON_PERSISTENT))
-deliveryMode = javax.jms.DeliveryMode.NON_PERSISTENT;
-
-messagePriority = settings.getMessagePriority();
-messageType = settings.getMessageType();
-}
-
-/**
- * Verifies that the JMSProducer is in valid state before
- * it is started. For JMSProducer to be in valid state, it
needs
- * to have a message type assigned.
- */
-protected void validate()
-{
-super.validate();
-
-if (messageType == null ||
!(messageType.equals(JMSConfigConstants.TEXT_MESSAGE)
-|| messageType.equals(JMSConfigConstants.OBJECT_MESSAGE)
-|| messageType.equals(JMSConfigConstants.MAP_MESSAGE)) )
-{
-// Unsupported JMS Message Type ''{0}''. Valid values are
javax.jms.TextMessage, javax.jms.ObjectMessage, javax.jms.MapMessage.
-ConfigurationException ce = new ConfigurationException();
-ce.setMessage(JMSConfigConstants.INVALID_JMS_MESSAGE_TYPE, new
Object[] {messageType});
-throw ce;
-}
-}
-
-/**
- * Starts the JMSProducer. Subclasses should call
super.start.
- */
-public void start() throws NamingException, JMSException
-{
-super.start();
-
-if (Log.isInfo())
-Log.getLogger(JMSAdapter.LOG_CATEGORY).info("JMS producer for JMS
destination '"
-+ destinatio
[33/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/MessageBrokerServlet.java
--
diff --git a/core/src/flex/messaging/MessageBrokerServlet.java
b/core/src/flex/messaging/MessageBrokerServlet.java
deleted file mode 100644
index 0e8efb0..000
--- a/core/src/flex/messaging/MessageBrokerServlet.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * 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 flex.messaging;
-
-import flex.management.MBeanLifecycleManager;
-import flex.management.MBeanServerLocatorFactory;
-import flex.messaging.config.ConfigurationManager;
-import flex.messaging.config.FlexConfigurationManager;
-import flex.messaging.config.MessagingConfiguration;
-import flex.messaging.endpoints.Endpoint;
-import flex.messaging.io.SerializationContext;
-import flex.messaging.io.TypeMarshallingContext;
-import flex.messaging.log.HTTPRequestLog;
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-import flex.messaging.log.Logger;
-import flex.messaging.log.LoggingHttpServletRequestWrapper;
-import flex.messaging.log.ServletLogTarget;
-import flex.messaging.services.AuthenticationService;
-import flex.messaging.util.ClassUtil;
-import flex.messaging.util.ExceptionUtil;
-import flex.messaging.util.Trace;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.Principal;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * The MessageBrokerServlet bootstraps the MessageBroker,
- * adds endpoints to it, and starts the broker. The servlet
- * also acts as a facade for all http-based endpoints, in that
- * the servlet receives the http request and then delegates to
- * an endpoint that can handle the request's content type. This
- * does not occur for non-http endpoints, such as the rtmp endpoint.
- *
- * @see flex.messaging.MessageBroker
- *
- */
-public class MessageBrokerServlet extends HttpServlet
-{
-static final long serialVersionUID = -5293855229461612246L;
-
-public static final String LOG_CATEGORY_STARTUP_BROKER =
LogCategories.STARTUP_MESSAGEBROKER;
-private static final String STRING_UNDEFINED_APPLICATION = "undefined";
-
-private MessageBroker broker;
-private HttpFlexSessionProvider httpFlexSessionProvider;
-private static String FLEXDIR = "/WEB-INF/flex/";
-private boolean log_errors = false;
-
-/**
- * Initializes the servlet in its web container, then creates
- * the MessageBroker and adds Endpoints and Services to that broker.
- * This servlet may keep a reference to an endpoint if it needs to
- * delegate to it in the service method.
- */
-public void init(ServletConfig servletConfig) throws ServletException
-{
-super.init(servletConfig);
-
-// allocate thread local variables
-createThreadLocals();
-
-// Set the servlet config as thread local
-FlexContext.setThreadLocalObjects(null, null, null, null, null,
servletConfig);
-
-ServletLogTarget.setServletContext(servletConfig.getServletContext());
-
-ClassLoader loader = getClassLoader();
-
-if
("true".equals(servletConfig.getInitParameter("useContextClassLoader")))
-{
-loader = Thread.currentThread().getContextClassLoader();
-}
-
-// Should we wrap http request for later error logging?
-log_errors = HTTPRequestLog.init(getServletContext());
-
-// Start the broker
-try
-{
-// Get the configuration manager
-ConfigurationManager configManager =
loadMessagingConfiguration(servletConfig);
-
-// Load configuration
-MessagingConfiguration config =
configManager.getMessagingConfiguration(servletConfig);
-
-// Set up logging system ahead of everything else.
-config.createLogAndTarge
[35/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/FlexSession.java
--
diff --git a/core/src/flex/messaging/FlexSession.java
b/core/src/flex/messaging/FlexSession.java
deleted file mode 100644
index 4f34f8a..000
--- a/core/src/flex/messaging/FlexSession.java
+++ /dev/null
@@ -1,1064 +0,0 @@
-/*
- * 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 flex.messaging;
-
-import flex.messaging.client.FlexClient;
-import flex.messaging.client.FlexClientListener;
-import flex.messaging.log.LogCategories;
-import flex.messaging.messages.Message;
-import flex.messaging.util.TimeoutAbstractObject;
-
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * The base for FlexSession implementations.
- */
-public abstract class FlexSession extends TimeoutAbstractObject implements
FlexClientListener, MessageClientListener
-{
-
//--
-//
-// Public Static Variables
-//
-
//--
-
-/**
- * Log category for FlexSession related messages.
- */
-public static final String FLEX_SESSION_LOG_CATEGORY =
LogCategories.ENDPOINT_FLEXSESSION;
-
-/**
- *
- */
-public static final int MAX_CONNECTIONS_PER_SESSION_UNLIMITED = -1;
-
-
//--
-//
-// Private Static Variables
-//
-
//--
-
-/**
- * The set of session created listeners to notify upon a new session
creation.
- */
-private static final CopyOnWriteArrayList
createdListeners = new CopyOnWriteArrayList();
-
-/**
- * Error string constants.
- */
-private static final int FLEX_SESSION_INVALIDATED = 10019;
-
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- *
- * @deprecated Post 2.6.1 releases require use of the constructor that
takes an AbstractFlexSessionProvider argument.
- */
-public FlexSession()
-{
-this(null);
-}
-
-/**
- *
- * Constructs a new FlexSession instance.
- *
- * @param sessionProvider The provider that instantiated this instance.
- */
-public FlexSession(AbstractFlexSessionProvider sessionProvider)
-{
-this.sessionProvider = sessionProvider;
-}
-
-
//--
-//
-// Static Methods
-//
-
//--
-
-/**
- * Adds a session created listener that will be notified when new sessions
- * are created.
- *
- * @see flex.messaging.FlexSessionListener
- *
- * @param listener The listener to add.
- */
-public static void addSessionCreatedListener(FlexSessionListener listener)
-{
-if (listener != null)
-createdListeners.addIfAbsent(listener);
-}
-
-/**
- * Removes a session created listener.
- *
- * @see flex.messaging.FlexSessionListener
- *
- * @param listener The listener to remove.
- */
-public static void removeSessionCreatedListener(FlexSessionListener
listener)
-{
-if (listener != null)
-createdListeners.remove(listener);
-}
-
-
//--
-//
-// Variables
-//
-
//--
-
-/**
- * Flag used to break cycles during invalidation.
- */
-protected boolean invalidating;
-
-/**
- * Instance lev
[47/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/messaging/errors.properties
--
diff --git a/common/src/flex/messaging/errors.properties
b/common/src/flex/messaging/errors.properties
deleted file mode 100644
index 6ff59b0..000
--- a/common/src/flex/messaging/errors.properties
+++ /dev/null
@@ -1,432 +0,0 @@
-# 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.
-
-# IMPORTANT: Error messages are now split between two files in BlazeDS and
LCDS.
-# This file is for BlazeDS error messages (which can be used by LCDS code as
well).
-# LCDS only messages now live in a separate file in the LCDS branch. While
editing
-# these files, keep in mind that both files are part of the same numeric
sequence.
-#
-# Error and details messages for LocalizedMessageExceptions are stored in the
following format:
-# Error message: {number}[-{variant}]={message}
-# Details message: {number}[-{variant}]-details={details}
-#
-# Server error numbers start at 1.
-#
-# Error numbers are chosen by taking the next available value in a numeric
sequence.
-# Each functional component or group of components should claim a unique block
of 50
-# numbers to use for error and details messages. If this initial set of 50
values
-# are exhausted, the component should claim the next available block of 50
values for
-# its use. This means that an error-ridden component may well use a disjoint
set of
-# error numbers. Here's an example:
-# FeatureError numbers claimed
-# ---
-# Security 10050-10099
-# Configuration 10100-10149
-# Security 10150-10199 <- Security exhausted its first block, so it
claims the next
-# available block of 50 values for its continued
use.
-#
-# Constants to lookup error/details strings by 'number', and optional
'variant',
-# should be defined in the classes that use them. When a class needs to define
a new
-# error and/or details string, add the necessary string(s) to this file using
the next
-# available numeric value in the corresponding range.
-#
-# The structure of this file should be maintained according to increasing
error number. This
-# means that for features that throw many errors, blocks of corresponding
message strings
-# won't necessarily be contiguous, but this simplifies identifying the
starting value for
-# the next available block of values and simplifies validation that duplicate
error numbers
-# are not being used.
-# * Caution: Reusing a property key doesn't generate any error, so watch for
typos.
-#The last defined property with a duplicate key clobbers the
earlier values.
-
-# 1-10049: General LocalizedException messages (in MessageBrokerFilter and
MessageBroker).
-1=There was an unhandled failure on the server. {0}
-10001=Null endpoint id arrived on message.
-10002=No such endpoint: {0}
-10003=No configured channel has an endpoint path ''{0}''.
-10004=The supplied destination id is not registered with any service.
-10005=Destination ''{0}'' not accessible over channel ''{1}''.
-10006=Error occurred while attempting to convert an input argument''s type.
-10007=Cannot invoke method ''{0}''.
-10007-0-details=Method ''{0}'' not found.
-10007-1-details={0} arguments were sent but {1} were expected.
-10007-2-details=The expected argument types are ({0}) but the supplied types
were ({1}) and converted to ({2}).
-10007-3-details=The expected argument types are ({0}) but the supplied types
were ({1}) with none successfully converted.
-10007-4-details=The expected argument types are ({0}) but no arguments were
provided.
-10007-5-details=No arguments were expected but the following types were
supplied ({0}).
-10008=Cannot create class of type ''{0}''.
-10008-0-details=Type ''{0}'' not found.
-10009=Given type ''{0}'' is not of expected type ''{1}''.
-10010=Unable to create a new instance of type ''{0}''.
-10010-0-details=Types must have a public, no arguments constructor.
-10010-1-details=Interfaces cannot be instantiated.
-10010-2-details=Abstract types cannot be instantiated.
-10010-3-details=Types cannot be instantiated without a public, no arguments
con
[11/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/services/MessageService.java
--
diff --git a/core/src/flex/messaging/services/MessageService.java
b/core/src/flex/messaging/services/MessageService.java
deleted file mode 100644
index 36aeb6d..000
--- a/core/src/flex/messaging/services/MessageService.java
+++ /dev/null
@@ -1,1246 +0,0 @@
-/*
- * 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 flex.messaging.services;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import flex.management.runtime.messaging.MessageDestinationControl;
-import flex.management.runtime.messaging.services.MessageServiceControl;
-import flex.messaging.Destination;
-import flex.messaging.FlexContext;
-import flex.messaging.MessageBroker;
-import flex.messaging.MessageClient;
-import flex.messaging.MessageDestination;
-import flex.messaging.MessageException;
-import flex.messaging.MessageRoutedNotifier;
-import flex.messaging.client.FlushResult;
-import flex.messaging.cluster.Cluster;
-import flex.messaging.cluster.ClusterManager;
-import flex.messaging.config.ConfigurationConstants;
-import flex.messaging.config.ConfigurationException;
-import flex.messaging.config.ServerSettings;
-import flex.messaging.config.ServerSettings.RoutingMode;
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-import flex.messaging.messages.AcknowledgeMessage;
-import flex.messaging.messages.AsyncMessage;
-import flex.messaging.messages.CommandMessage;
-import flex.messaging.messages.Message;
-import flex.messaging.messages.MessagePerformanceUtils;
-import flex.messaging.services.messaging.MessagingConstants;
-import flex.messaging.services.messaging.RemoteSubscriptionManager;
-import flex.messaging.services.messaging.SubscriptionManager;
-import flex.messaging.services.messaging.Subtopic;
-import flex.messaging.services.messaging.ThrottleManager;
-import flex.messaging.services.messaging.adapters.MessagingAdapter;
-import
flex.messaging.services.messaging.adapters.MessagingSecurityConstraintManager;
-import flex.messaging.services.messaging.selector.JMSSelector;
-import flex.messaging.util.StringUtils;
-
-/**
- * The MessageService class is the Service implementation that manages
point-to-point
- * and publish-subscribe messaging.
- */
-public class MessageService extends AbstractService implements
MessagingConstants
-{
-/** Log category for MessageService. */
-public static final String LOG_CATEGORY = LogCategories.SERVICE_MESSAGE;
-/** Log category for MessageService that captures message
timing. */
-public static final String TIMING_LOG_CATEGORY =
LogCategories.MESSAGE_TIMING;
-
-
-public static final String NOT_SUBSCRIBED_CODE =
"Server.Processing.NotSubscribed";
-
-// Errors
-private static final int BAD_SELECTOR = 10550;
-private static final int NOT_SUBSCRIBED = 10551;
-private static final int UNKNOWN_COMMAND = 10552;
-
-private boolean debug;
-private MessageServiceControl controller;
-
-private ReadWriteLock subscribeLock = new ReentrantReadWriteLock();
-
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Constructs an unmanaged MessageService.
- */
-public MessageService()
-{
-super(false);
-}
-
-/**
- * Constructs an MessageService with the indicated management.
- *
- * @param enableManagement true if the
MessageService
- * is manageable; otherwise false.
- */
-public MessageService(boolean enableManagement)
-{
-super(enableManagement);
-}
-
-
//--
-//
-// Initialize, validate, start, and stop methods.
-//
-
[50/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/graphics/ImageSnapshot.java
--
diff --git a/common/src/flex/graphics/ImageSnapshot.java
b/common/src/flex/graphics/ImageSnapshot.java
deleted file mode 100644
index 1dc97f0..000
--- a/common/src/flex/graphics/ImageSnapshot.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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 flex.graphics;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * This class corresponds to mx.graphics.ImageSnapshot on the client. Clients
may choose
- * to capture images and send them to the server via a RemoteObject call. The
PDF generation
- * feature of LCDS may then be used to generate PDF's from these images.
- *
- */
-public class ImageSnapshot extends HashMap
-{
-private static final long serialVersionUID = 7914317354403674061L;
-
-/**
- * Default constructor.
- */
-public ImageSnapshot()
-{
-}
-
-private Map properties;
-private String contentType;
-private byte[] data;
-private int height;
-private int width;
-
-/**
- * The content type for the image encoding format that was used to capture
- * this snapshot.
- *
- * @return content type of this image
- */
-public String getContentType()
-{
-return contentType;
-}
-
-/**
- * Sets content type of this snapshot.
- *
- * @param value content type
- */
-public void setContentType(String value)
-{
-contentType = value;
-}
-
-/**
- * The encoded data representing the image snapshot.
- *
- * @return encoded image data
- */
-public byte[] getData()
-{
-return data;
-}
-
-/**
- * Set the encoded data representing the image snapshot.
- *
- * @param value byte array of image data
- */
-public void setData(byte[] value)
-{
-data = value;
-}
-
-/**
- * The image height in pixels.
- *
- * @return image height in pixels
- */
-public int getHeight()
-{
-return height;
-}
-
-/**
- * Set image height in pixels.
- *
- * @param value image height in pixels.
- */
-public void setHeight(int value)
-{
-height = value;
-}
-
-/**
- * Additional properties of the image.
- *
- * @return a map containing the dynamically set properties on this snapshot
- */
-public Map getProperties()
-{
-return properties;
-}
-
-/**
- * Sets the map of dynamic properties for this snapshot.
- *
- * @param value map containing dynamic properties for this snapshot
- */
-public void setProperties(Map value)
-{
-properties = value;
-}
-
-/**
- * The image width in pixels.
- *
- * @return width in pixels
- */
-public int getWidth()
-{
-return width;
-}
-
-/**
- * Set width in pixels.
- *
- * @param value width in pixels.
- */
-public void setWidth(int value)
-{
-width = value;
-}
-
-}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/graphics/package-info.java
--
diff --git a/common/src/flex/graphics/package-info.java
b/common/src/flex/graphics/package-info.java
deleted file mode 100644
index 87093bf..000
--- a/common/src/flex/graphics/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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" BAS
[48/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/messaging/config/FlexClientSettings.java
--
diff --git a/common/src/flex/messaging/config/FlexClientSettings.java
b/common/src/flex/messaging/config/FlexClientSettings.java
deleted file mode 100644
index bba7e5a..000
--- a/common/src/flex/messaging/config/FlexClientSettings.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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 flex.messaging.config;
-
-/**
- *
- */
-public class FlexClientSettings extends PropertiesSettings
-{
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Constructs a FlexClientSettings instance.
- */
-public FlexClientSettings()
-{
-// Empty for now.
-}
-
-
//--
-//
-// Properties
-//
-
//--
-
-private long timeoutMinutes = -1;
-
-/**
- * Returns the number of minutes before an idle FlexClient is timed out.
- *
- * @return The number of minutes before an idle FlexClient is timed out.
- */
-public long getTimeoutMinutes()
-{
-return timeoutMinutes;
-}
-
-/**
- * Sets the number of minutes before an idle FlexClient is timed out.
- *
- * @param value The number of minutes before an idle FlexClient is timed
out.
- */
-public void setTimeoutMinutes(long value)
-{
-timeoutMinutes = value;
-}
-
-private String flexClientOutboundQueueProcessorClassName;
-
-/**
- * Returns the name of the default
FlexClientOutboundQueueProcessorClass.
- *
- * @return The the name of the default
FlexClientOutboundQueueProcessorClass.
- */
-public String getFlexClientOutboundQueueProcessorClassName()
-{
-return flexClientOutboundQueueProcessorClassName;
-}
-
-/**
- * Sets the name of the default
FlexClientOutboundQueueProcessor.
- *
- * @param flexClientOutboundQueueProcessorClassName The name of the
default FlexClientOutboundQueueProcessor.
- */
-public void setFlexClientOutboundQueueProcessorClassName(String
flexClientOutboundQueueProcessorClassName)
-{
-this.flexClientOutboundQueueProcessorClassName =
flexClientOutboundQueueProcessorClassName;
-}
-
-private ConfigMap flexClientOutboundQueueProcessorProperties;
-
-/**
- * Returns the properties for the default
FlexClientOutboundQueueProcessor.
- *
- * @return The properties for the default
FlexClientOutboundQueueProcessor.
- */
-public ConfigMap getFlexClientOutboundQueueProcessorProperties()
-{
-return flexClientOutboundQueueProcessorProperties;
-}
-
-/**
- * Sets the properties for the default
FlexClientOutboundQueueProcessor.
- *
- * @param flexClientOutboundQueueProcessorProperties properties for the
default
- *
FlexClientOutboundQueueProcessor
- */
-public void setFlexClientOutboundQueueProcessorProperties(ConfigMap
flexClientOutboundQueueProcessorProperties)
-{
-this.flexClientOutboundQueueProcessorProperties =
flexClientOutboundQueueProcessorProperties;
-}
-
-private int reliableReconnectDurationMillis;
-
-public int getReliableReconnectDurationMillis()
-{
-return reliableReconnectDurationMillis;
-}
-
-public void setReliableReconnectDurationMillis(int value)
-{
-reliableReconnectDurationMillis = value;
-}
-
-private int heartbeatIntervalMillis;
-
-public int getHeartbeatIntervalMillis()
-{
-return heartbeatIntervalMillis;
-}
-
-public void setHeartbeatIntervalMillis(int value)
-{
-heartbeatIntervalMillis = value;
-}
-}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/messaging/config/LocalFil
[28/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/config/MessagingConfiguration.java
--
diff --git a/core/src/flex/messaging/config/MessagingConfiguration.java
b/core/src/flex/messaging/config/MessagingConfiguration.java
deleted file mode 100644
index 70987a2..000
--- a/core/src/flex/messaging/config/MessagingConfiguration.java
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*
- * 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 flex.messaging.config;
-
-import flex.management.ManageableComponent;
-import flex.management.runtime.messaging.endpoints.EndpointControl;
-import flex.messaging.Destination;
-import flex.messaging.FlexComponent;
-import flex.messaging.FlexContext;
-import flex.messaging.MessageBroker;
-import flex.messaging.Server;
-import flex.messaging.client.FlexClientManager;
-import flex.messaging.cluster.ClusterManager;
-import flex.messaging.endpoints.AbstractEndpoint;
-import flex.messaging.endpoints.Endpoint;
-import flex.messaging.endpoints.Endpoint2;
-import flex.messaging.log.Log;
-import flex.messaging.log.Target;
-import flex.messaging.security.LoginCommand;
-import flex.messaging.security.LoginManager;
-import flex.messaging.services.AuthenticationService;
-import flex.messaging.services.Service;
-import flex.messaging.services.ServiceAdapter;
-import flex.messaging.util.ClassUtil;
-import flex.messaging.util.RedeployManager;
-import flex.messaging.util.StringUtils;
-import flex.messaging.util.ToStringPrettyPrinter;
-import flex.messaging.util.UUIDGenerator;
-import flex.messaging.validators.DeserializationValidator;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * This object encapsulates settings for a MessageBroker instance.
- * The MessageBroker itself has no knowledge of configuration specifics;
- * instead, this object sets the relevant values on the broker using
- * information which a ConfigurationParser has provided for it.
- *
- *
- */
-public class MessagingConfiguration implements ServicesConfiguration
-{
-private final String asyncMessageBrokerType =
"flex.messaging.AsyncMessageBroker";
-private final String asyncFlexClientManagerType =
"flex.messaging.client.AsyncFlexClientManager";
-
-private final Map channelSettings;
-private final List defaultChannels;
-private final SecuritySettings securitySettings;
-private final List serviceSettings;
-private final List sharedServerSettings;
-private LoggingSettings loggingSettings;
-private SystemSettings systemSettings;
-private FlexClientSettings flexClientSettings;
-private final Map clusterSettings;
-private final Map factorySettings;
-private final List messageFilterSettings;
-private final Map validatorSettings;
-
-/**
- * Constructor.
- * Construct a MessagingConfiguration object
- *
- */
-public MessagingConfiguration()
-{
-channelSettings = new HashMap();
-defaultChannels = new ArrayList(4);
-clusterSettings = new HashMap();
-factorySettings = new HashMap();
-serviceSettings = new ArrayList();
-sharedServerSettings = new ArrayList();
-securitySettings = new SecuritySettings();
-messageFilterSettings = new ArrayList();
-validatorSettings = new HashMap();
-}
-
-/**
- * Configure the MessageBroker.
- *
- * @param broker current MessageBroker object
- */
-public void configureBroker(MessageBroker broker)
-{
-boolean async =
(broker.getClass().getName().equals(asyncMessageBrokerType));
-
-broker.setChannelSettings(channelSettings);
-broker.setSecuritySettings(securitySettings);
-broker.setSystemSettings(systemSettings);
-broker.setFlexClientSettings(flexClientSettings);
-
-// validators need to come first so that the other code can use them
-createValidators(broker);
-
[29/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/cluster/ClusterException.java
--
diff --git a/core/src/flex/messaging/cluster/ClusterException.java
b/core/src/flex/messaging/cluster/ClusterException.java
deleted file mode 100644
index c0dc41d..000
--- a/core/src/flex/messaging/cluster/ClusterException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 flex.messaging.cluster;
-
-import flex.messaging.MessageException;
-
-/**
- *
- * Exception type for cluster errors.
- */
-public class ClusterException extends MessageException
-{
-/**
- * Serializable version uid.
- */
-static final long serialVersionUID = 1948590697997522770L;
-}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/cluster/ClusterManager.java
--
diff --git a/core/src/flex/messaging/cluster/ClusterManager.java
b/core/src/flex/messaging/cluster/ClusterManager.java
deleted file mode 100644
index 07ef180..000
--- a/core/src/flex/messaging/cluster/ClusterManager.java
+++ /dev/null
@@ -1,673 +0,0 @@
-/*
- * 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 flex.messaging.cluster;
-
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Collections;
-import java.util.TreeSet;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import flex.messaging.Destination;
-import flex.messaging.MessageBroker;
-import flex.messaging.config.ClusterSettings;
-import flex.messaging.config.ConfigMap;
-import flex.messaging.endpoints.Endpoint;
-import flex.messaging.util.ClassUtil;
-
-/**
- *
- * The manager of all clusters defined in services-config.xml, and the broker
- * for the clusters created for clustered destinations.
- */
-public class ClusterManager
-{
-/**
- * Supported operations.
- */
-public static final String OPERATION_ADD_ENDPOINT_FOR_CHANNEL =
"addEndpointForChannel";
-public static final String OPERATION_SEND_ENDPOINT_URL = "sendEndpointUrl";
-public static final String OPERATION_RECEIVE_ENDPOINT_URL =
"receiveEndpointUrl";
-
-public static final String OPERATION_PUSH_MESSAGE_FROM_PEER =
"pushMessageFromPeer";
-public static final String OPERATION_PEER_SYNC_AND_PUSH =
"peerSyncAndPush";
-public static final String OPERATION_REQUEST_ADAPTER_STATE =
"requestAdapterState";
-public static final String OPERATION_RECEIVE_ADAPTER_STATE =
"receiveAdapterState";
-public static final String OPERATION_SEND_SUBSCRIPTIONS =
"sendSubscriptions";
-public static final String OPERATION_RECEIVE_SUBSCRIPTIONS =
"receiveSubscriptions";
-public static final String OPERATION_SUBSCRIBE_FROM_PEER =
"subscribeFromPeer";
-public static final String OPERATION_PUSH_MESSAGE_FROM_PEER_TO_PEER =
"pushMessageFromPeerToPeer";
-public static final String OPERATION_PEER_SYNC_AND_PUSH_ONE_TO_PEER =
"peerSyncAndPushOneToPeer";
-
-/**
- * A link to the MessageBroker.
-
[13/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/messages/AsyncMessage.java
--
diff --git a/core/src/flex/messaging/messages/AsyncMessage.java
b/core/src/flex/messaging/messages/AsyncMessage.java
deleted file mode 100644
index efb4b9a..000
--- a/core/src/flex/messaging/messages/AsyncMessage.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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 flex.messaging.messages;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import flex.messaging.util.UUIDUtils;
-import flex.messaging.log.Log;
-
-/**
- * This type of message contains information necessary to perform
- * point-to-point or publish-subscribe messaging.
- */
-public class AsyncMessage extends AbstractMessage implements SmallMessage
-{
-/**
- * This number was generated using the 'serialver' command line tool.
- * This number should remain consistent with the version used by
- * ColdFusion to communicate with the message broker over RMI.
- */
-private static final long serialVersionUID = -3549535089417916783L;
-
-/**
- * The name for the subtopic header if the message targets a destination
- * subtopic.
- */
-public static final String SUBTOPIC_HEADER_NAME = "DSSubtopic";
-
-// Serialization constants
-private static byte CORRELATION_ID_FLAG = 1;
-private static byte CORRELATION_ID_BYTES_FLAG = 2;
-
-protected String correlationId;
-protected byte[] correlationIdBytes;
-
-/**
- * Default constructor for AsyncMessage.
- */
-public AsyncMessage()
-{
-// No-op.
-}
-
-/**
- * Gets the correlationId of the AsyncMessage.
- *
- * @return The correlation id.
- */
-public String getCorrelationId()
-{
-return correlationId;
-}
-
-/**
- * Sets the correlationId of the AsyncMessage.
- *
- * @param correlationId The correlationId for the message.
- */
-public void setCorrelationId(String correlationId)
-{
-this.correlationId = correlationId;
-}
-
-/**
- *
- */
-public Message getSmallMessage()
-{
-return getClass() == AsyncMessage.class? new AsyncMessageExt(this) :
null;
-}
-
-/**
- *
- */
-@Override public void readExternal(ObjectInput input)throws IOException,
ClassNotFoundException
-{
-super.readExternal(input);
-
-short[] flagsArray = readFlags(input);
-for (int i = 0; i < flagsArray.length; i++)
-{
-short flags = flagsArray[i];
-short reservedPosition = 0;
-
-if (i == 0)
-{
-if ((flags & CORRELATION_ID_FLAG) != 0)
-correlationId = (String)input.readObject();
-
-if ((flags & CORRELATION_ID_BYTES_FLAG) != 0)
-{
-correlationIdBytes = (byte[])input.readObject();
-correlationId =
UUIDUtils.fromByteArray(correlationIdBytes);
-}
-
-reservedPosition = 2;
-}
-
-// For forwards compatibility, read in any other flagged objects
-// to preserve the integrity of the input stream...
-if ((flags >> reservedPosition) != 0)
-{
-for (short j = reservedPosition; j < 6; j++)
-{
-if (((flags >> j) & 1) != 0)
-input.readObject();
-}
-}
-}
-}
-
-/**
- *
- */
-@Override public void writeExternal(ObjectOutput output) throws IOException
-{
-super.writeExternal(output);
-
-if (correlationIdBytes == null && correlationId != null)
-correlationIdBytes = UUIDUtils.toByteArray(correlationId);
-
-short flags = 0;
-
-if (correlationId != null && correlationIdBytes == null)
-flags |= CORRELATION_ID_FLAG;
-
-if (correlationIdBytes != null)
-flags |= CORRELATION_ID_BYTES_FLAG;
-
-output.writeByte(flags);
-
-if (correlationId
[09/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java
--
diff --git
a/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java
b/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java
deleted file mode 100644
index d04539f..000
--- a/core/src/flex/messaging/services/messaging/adapters/JMSAdapter.java
+++ /dev/null
@@ -1,1114 +0,0 @@
-/*
- * 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 flex.messaging.services.messaging.adapters;
-
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.jms.JMSException;
-import javax.naming.Context;
-
-import
flex.management.runtime.messaging.services.messaging.adapters.JMSAdapterControl;
-import flex.messaging.Destination;
-import flex.messaging.MessageClient;
-import flex.messaging.MessageClientListener;
-import flex.messaging.MessageDestination;
-import flex.messaging.MessageException;
-import flex.messaging.config.ConfigMap;
-import flex.messaging.config.ConfigurationException;
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-import flex.messaging.messages.CommandMessage;
-import flex.messaging.messages.ErrorMessage;
-import flex.messaging.messages.Message;
-import flex.messaging.messages.MessagePerformanceInfo;
-import flex.messaging.messages.MessagePerformanceUtils;
-import flex.messaging.services.MessageService;
-import flex.messaging.services.messaging.adapters.JMSSettings.DeliverySettings;
-
-/**
- * This adapter for the MessageService integrates Flex messaging
- * with Java Message Service destinations.
- */
-public class JMSAdapter extends MessagingAdapter implements
JMSConfigConstants, JMSExceptionListener, JMSMessageListener,
MessageClientListener
-{
-public static final String LOG_CATEGORY =
LogCategories.SERVICE_MESSAGE_JMS;
-private static final String DURABLE_SUBSCRIBER_NAME_PREFIX = "FlexClient_";
-
-// Note that clientId is kept track as Object (instead of String) in all of
-// these data structures because in clustering, clientId is not a String,
-// it's an instance of org.jgroups.stack.IpAddress instead.
-private Map consumerToClientId;
-private Map messageClients;
-private LinkedList topicProducers;
-private Map topicConsumers;
-private LinkedList queueProducers;
-private Map queueConsumers;
-
-// JMSAdapter properties
-private JMSSettings settings;
-private JMSAdapterControl controller;
-
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Constructs an unmanaged JMSAdapter instance.
- */
-public JMSAdapter()
-{
-this(false);
-}
-
-/**
- * Constructs a JMSAdapter instance.
- *
- * @param enableManagement true if the JMSAdapter
- * has a corresponding MBean control for management; otherwise
false.
- */
-public JMSAdapter(boolean enableManagement)
-{
-super(enableManagement);
-consumerToClientId = new ConcurrentHashMap();
-messageClients = new ConcurrentHashMap();
-topicProducers = new LinkedList();
-topicConsumers = new ConcurrentHashMap();
-queueProducers = new LinkedList();
-queueConsumers = new ConcurrentHashMap();
-settings = new JMSSettings();
-}
-
-
//--
-//
-// Initialize, validate, start, and stop methods.
-//
-
//--
-
-/**
- * Initializes the JMSAdapter with the properties.
- *
- * @param id The id of the JMSAdapter.
- * @param properties Properties for the JMSAdapter.
- */
-@Override
-public voi
[24/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/endpoints/BasePollingHTTPEndpoint.java
--
diff --git a/core/src/flex/messaging/endpoints/BasePollingHTTPEndpoint.java
b/core/src/flex/messaging/endpoints/BasePollingHTTPEndpoint.java
deleted file mode 100644
index 0353354..000
--- a/core/src/flex/messaging/endpoints/BasePollingHTTPEndpoint.java
+++ /dev/null
@@ -1,606 +0,0 @@
-/*
- * 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 flex.messaging.endpoints;
-
-import flex.messaging.FlexContext;
-import flex.messaging.FlexSession;
-import flex.messaging.client.FlexClient;
-import flex.messaging.client.FlushResult;
-import flex.messaging.client.PollFlushResult;
-import flex.messaging.client.PollWaitListener;
-import flex.messaging.client.UserAgentSettings;
-import flex.messaging.config.ConfigMap;
-import flex.messaging.config.ConfigurationConstants;
-import flex.messaging.log.Log;
-import flex.messaging.messages.CommandMessage;
-import flex.messaging.util.UserAgentManager;
-
-import java.util.Enumeration;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Base class for HTTP-based endpoints that support regular polling and long
polling,
- * which means placing request threads that are polling for messages into a
wait
- * state until messages are available for delivery or the configurable wait
interval
- * is reached.
- */
-public abstract class BasePollingHTTPEndpoint extends BaseHTTPEndpoint
implements PollWaitListener
-{
-
//--
-//
-// Private Static Constants
-//
-
//--
-
-private static final String POLLING_ENABLED = "polling-enabled";
-private static final String POLLING_INTERVAL_MILLIS =
"polling-interval-millis";
-private static final String POLLING_INTERVAL_SECONDS =
"polling-interval-seconds"; // Deprecated configuration option.
-private static final String MAX_WAITING_POLL_REQUESTS =
"max-waiting-poll-requests";
-private static final String WAIT_INTERVAL_MILLIS = "wait-interval-millis";
-private static final String CLIENT_WAIT_INTERVAL_MILLIS =
"client-wait-interval-millis";
-// Force clients that exceed the long-poll limit to wait at least this
long between poll requests.
-// This matches the default polling interval defined in the client
PollingChannel.
-private static final int DEFAULT_WAIT_FOR_EXCESS_POLL_WAIT_CLIENTS = 3000;
-
-// User Agent based settings manager
-private UserAgentManager userAgentManager = new UserAgentManager();
-
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Constructs an unmanaged BasePollingHTTPEndpoint.
- */
-public BasePollingHTTPEndpoint()
-{
-this(false);
-}
-
-/**
- * Constructs an BasePollingHTTPEndpoint with the indicated
management.
- *
- * @param enableManagement true if the
BasePollingHTTPEndpoint
- * is manageable; false otherwise.
- */
-public BasePollingHTTPEndpoint(boolean enableManagement)
-{
-super(enableManagement);
-}
-
-
//--
-//
-// Initialize, validate, start, and stop methods.
-//
-
//--
-
-/**
- * Initializes the Endpoint with the properties.
- * If subclasses override this method, they must call
super.initialize().
- *
- * @param id The ID of the Endpoint.
- * @param properties Properties for the Endpoint.
- */
-@Override
-public void initialize(String id, ConfigMap properties)
-{
-super.initialize(id, properties);
-
-if (properties == null || properties.size() == 0)
-{
-// Initialize default user agent manager settings.
-UserAgentManager.setupUserAgentManager(null, userAg
[04/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java
--
diff --git a/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java
b/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java
new file mode 100644
index 000..95a2474
--- /dev/null
+++ b/core/src/main/java/flex/management/jmx/MBeanConstructorInfo.java
@@ -0,0 +1,104 @@
+/*
+ * 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 flex.management.jmx;
+
+/**
+ * Remotable MBeanConstructorInfo class that complies with Flash
serialization requirements.
+ */
+public class MBeanConstructorInfo
+{
+/**
+ * The name of the constructor.
+ */
+public String name;
+
+/**
+ * The description of the constructor.
+ */
+public String description;
+
+/**
+ * The constructor's parameter signature.
+ */
+public MBeanParameterInfo[] signature;
+
+/**
+ * Constructs an empty MBeanConstructorInfo instance.
+ *
+ */
+public MBeanConstructorInfo()
+{}
+
+/**
+ * Constructs a MBeanConstructorInfo instance based upon a
+ * javax.management.MBeanConstructorInfo instance.
+ *
+ * @param mbeanConstructorInfo The
javax.management.MBeanConstructorInfo to base this instance on.
+ */
+public MBeanConstructorInfo(javax.management.MBeanConstructorInfo
mbeanConstructorInfo)
+{
+name = mbeanConstructorInfo.getName();
+description = mbeanConstructorInfo.getDescription();
+signature = convertSignature(mbeanConstructorInfo.getSignature());
+}
+
+/**
+ * Utility method to convert this MBeanConstructorInfo
instance to a
+ * javax.management.MBeanConstructorInfo instance.
+ *
+ * @return A JMX MBeanConstructorInfo based upon this
instance.
+ */
+public javax.management.MBeanConstructorInfo toMBeanConstructorInfo()
+{
+return new javax.management.MBeanConstructorInfo(name,
+ description,
+
convertSignature(signature));
+}
+
+/**
+ * Utility method to convert the JMX constructor signature to our Flash
friendly param type.
+ *
+ * @param source The JMX constructor signature params.
+ * @return Flash friendly signature params.
+ */
+private MBeanParameterInfo[]
convertSignature(javax.management.MBeanParameterInfo[] source)
+{
+MBeanParameterInfo[] signature = new MBeanParameterInfo[source.length];
+for (int i = 0; i < source.length; i++)
+{
+signature[i] = new MBeanParameterInfo(source[i]);
+}
+return signature;
+}
+
+/**
+ * Utility method to convert a Flash friendly construtor param signature
to the JMX params.
+ *
+ * @param source The Flash friendly signature params.
+ * @return The JMX constructor signature params.
+ */
+private javax.management.MBeanParameterInfo[]
convertSignature(MBeanParameterInfo[] source)
+{
+javax.management.MBeanParameterInfo[] signature = new
javax.management.MBeanParameterInfo[source.length];
+for (int i = 0; i < source.length; i++)
+{
+signature[i] = source[i].toMBeanParameterInfo();
+}
+return signature;
+}
+
+}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/main/java/flex/management/jmx/MBeanInfo.java
--
diff --git a/core/src/main/java/flex/management/jmx/MBeanInfo.java
b/core/src/main/java/flex/management/jmx/MBeanInfo.java
new file mode 100644
index 000..d44e507
--- /dev/null
+++ b/core/src/main/java/flex/management/jmx/MBeanInfo.java
@@ -0,0 +1,184 @@
+/*
+ * 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
[03/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/main/java/flex/management/runtime/messaging/MessageBrokerControlMBean.java
--
diff --git
a/core/src/main/java/flex/management/runtime/messaging/MessageBrokerControlMBean.java
b/core/src/main/java/flex/management/runtime/messaging/MessageBrokerControlMBean.java
new file mode 100644
index 000..7270133
--- /dev/null
+++
b/core/src/main/java/flex/management/runtime/messaging/MessageBrokerControlMBean.java
@@ -0,0 +1,130 @@
+/*
+ * 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 flex.management.runtime.messaging;
+
+import flex.management.BaseControlMBean;
+
+import java.io.IOException;
+import java.util.Date;
+import javax.management.ObjectName;
+
+/**
+ * Defines the runtime monitoring and management interface for managed
MessageBrokers.
+ */
+public interface MessageBrokerControlMBean extends BaseControlMBean
+{
+/**
+ * Returns true if the MessageBroker is running.
+ *
+ * @return true if the MessageBroker is running.
+ * @throws IOException Throws IOException.
+ */
+Boolean isRunning() throws IOException;
+
+/**
+ * Returns the start timestamp for the MessageBroker.
+ *
+ * @return The start timestamp for the MessageBroker.
+ * @throws IOException Throws IOException.
+ */
+Date getStartTimestamp() throws IOException;
+
+/**
+ * Returns the ObjectNames for endpoints that are registered
with the
+ * managed MessageBroker.
+ *
+ * @return The ObjectNames for endpoints registered with the
managed MessageBroker.
+ * @throws IOException Throws IOException.
+ */
+ObjectName[] getEndpoints() throws IOException;
+
+/**
+ * Returns the ObjectNames for services that are registered
with the
+ * managed MessageBroker.
+ *
+ * @return The ObjectNames for services registered with the
managed MessageBroker.
+ * @throws IOException Throws IOException.
+ */
+ObjectName[] getServices() throws IOException;
+
+/**
+ * Returns Flex session count for the MessageBroker.
+ *
+ * @return Flex session count for the MessageBroker.
+ * @throws IOException Throws IOException.
+ */
+Integer getFlexSessionCount() throws IOException;
+
+/**
+ * Returns the maximum concurrent Flex session count for the
+ * MessageBroker in the current hour.
+ *
+ * @return The maximum concurrent Flex session count for the
+ * MessageBroker over the course of the last hour.
+ * @throws IOException Throws IOException.
+ */
+Integer getMaxFlexSessionsInCurrentHour() throws IOException;
+
+/**
+ * Returns the number of Enterprise Connections across all
+ * Enterprise Endpoints.
+ *
+ * @return The number of Enterprise Connections
+ * @throws IOException Throws IOException.
+ */
+Integer getEnterpriseConnectionCount() throws IOException;
+
+/**
+ * Returns the total number of bytes passing through all AMF endpoints.
+ *
+ * @return The total number of bytes passing through all AMF endpoints.
+ * @throws IOException Throws IOException.
+ */
+Long getAMFThroughput() throws IOException;
+
+/**
+ * Returns the total number of bytes passing through all HTTP endpoints.
+ *
+ * @return The total number of bytes passing through all HTTP endpoints.
+ * @throws IOException Throws IOException.
+ */
+Long getHTTPThroughput() throws IOException;
+
+/**
+ * Returns the total number of bytes passing through all Enterprise
endpoints.
+ *
+ * @return The total number of bytes passing through all Enterprise
endpoints.
+ * @throws IOException Throws IOException.
+ */
+Long getEnterpriseThroughput() throws IOException;
+
+/**
+ * Returns the total number of bytes passing through all streaming AMF
endpoints.
+ *
+ * @return The total number of bytes passing through all streaming AMF
endpoints.
+ * @throws IOException Throws IOException.
+ */
+Long getStreamingAMFThroughput() throws IOException;
+
+/**
+ * Returns the total number of bytes
[01/51] [partial] flex-blazeds git commit: - Major code scrub
Repository: flex-blazeds
Updated Branches:
refs/heads/develop 2b91915fa -> 8315f8faf
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/main/java/flex/messaging/Destination.java
--
diff --git a/core/src/main/java/flex/messaging/Destination.java
b/core/src/main/java/flex/messaging/Destination.java
new file mode 100644
index 000..312e371
--- /dev/null
+++ b/core/src/main/java/flex/messaging/Destination.java
@@ -0,0 +1,802 @@
+/*
+ * 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 flex.messaging;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import flex.management.ManageableComponent;
+import flex.management.runtime.messaging.services.ServiceControl;
+import flex.messaging.log.LogCategories;
+import flex.messaging.log.Log;
+import flex.messaging.services.Service;
+import flex.messaging.services.ServiceAdapter;
+import flex.messaging.util.ClassUtil;
+import flex.messaging.cluster.ClusterManager;
+import flex.messaging.config.ClusterSettings;
+import flex.messaging.config.ConfigMap;
+import flex.messaging.config.ConfigurationConstants;
+import flex.messaging.config.ConfigurationException;
+import flex.messaging.config.NetworkSettings;
+import flex.messaging.config.SecurityConstraint;
+/**
+ * The Destination class is a source and sink for messages sent
through
+ * a service destination and uses an adapter to process messages.
+ */
+public class Destination extends ManageableComponent implements
java.io.Serializable
+{
+static final long serialVersionUID = -977001797620881435L;
+
+/** Default log category for Destination. */
+public static final String LOG_CATEGORY = LogCategories.SERVICE_GENERAL;
+
+/** Hard coded id for the push destination */
+public static final String PUSH_DESTINATION_ID = "_DS_PUSH_";
+
+// Errors
+private static final int NO_SERVICE = 7;
+
+// Destination's properties
+protected ServiceAdapter adapter;
+protected List channelIds;
+protected NetworkSettings networkSettings;
+protected SecurityConstraint securityConstraint;
+protected String securityConstraintRef;
+protected HashMap extraProperties;
+protected boolean initialized;
+protected boolean clustered;
+protected boolean clusteredCalculated;
+
+
//--
+//
+// Constructor
+//
+
//--
+
+/**
+ * Constructs an unmanaged Destination instance.
+ */
+public Destination()
+{
+this(false);
+}
+
+/**
+ * Constructs a Destination with the indicated management.
+ *
+ * @param enableManagement true if the
Destination
+ * is manageable; otherwise false.
+ */
+public Destination(boolean enableManagement)
+{
+super(enableManagement);
+
+networkSettings = new NetworkSettings();
+}
+
+
//--
+//
+// Initialize, validate, start, and stop methods.
+//
+
//--
+
+/**
+ * Initializes the Destination with the properties.
+ * If subclasses override, they must call super.initialize().
+ *
+ * @param id The id of the destination.
+ * @param properties Properties for the destination.
+ */
+@Override
+public void initialize(String id, ConfigMap properties)
+{
+super.initialize(id, properties);
+
+if (properties == null || properties.size() == 0)
+{
+initialized = true;
+return;
+}
+
+ConfigMap network =
properties.getPropertyAsMap(NetworkSettings.NETWORK_ELEMENT, null);
+
+if (network != null)
+{
+
networkSettings.setReliable(network.getPropertyAsBoolean(NetworkSettings.RELIABLE_ELEMENT,
false));
+
+ConfigMap clusterInfo =
network.getPropertyAsMap(ClusterSettings.CLUSTER_ELEMENT, null);
+
[27/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/config/ServerConfigurationParser.java
--
diff --git a/core/src/flex/messaging/config/ServerConfigurationParser.java
b/core/src/flex/messaging/config/ServerConfigurationParser.java
deleted file mode 100644
index 9ff3e1c..000
--- a/core/src/flex/messaging/config/ServerConfigurationParser.java
+++ /dev/null
@@ -1,1920 +0,0 @@
-/*
- * 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 flex.messaging.config;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.StringTokenizer;
-
-import flex.messaging.config.ThrottleSettings.Policy;
-import flex.messaging.util.LocaleUtils;
-
-/**
- * Processes DOM representation of a messaging configuration file.
- *
- * Note: Since reference ids are used between elements, certain
- * sections of the document need to be parsed first.
- *
- *
- *
- */
-public abstract class ServerConfigurationParser extends
AbstractConfigurationParser
-{
-/**
- * Used to verify that advanced messaging support has been registered if
necessary.
- * If other configuration requires it, but it was not registered a
ConfigurationException is thrown.
- */
-private boolean verifyAdvancedMessagingSupport = false;
-private boolean advancedMessagingSupportRegistered = false;
-
-@Override
-protected void parseTopLevelConfig(Document doc)
-{
-Node root = selectSingleNode(doc, "/" + SERVICES_CONFIG_ELEMENT);
-
-if (root != null)
-{
-allowedChildElements(root, SERVICES_CONFIG_CHILDREN);
-
-securitySection(root); // Parse security before channels.
-
-serversSection(root);
-
-channelsSection(root);
-
-services(root);
-
-clusters(root);
-
-logging(root);
-
-system(root);
-
-flexClient(root);
-
-factories(root);
-
-messageFilters(root);
-
-validators(root);
-
-// Validate that any dependencies on advanced messaging support
can be satisified at runtime.
-if (verifyAdvancedMessagingSupport &&
!advancedMessagingSupportRegistered)
-{
-ConfigurationException e = new ConfigurationException();
-e.setMessage(REQUIRE_ADVANCED_MESSAGING_SUPPORT);
-throw e;
-}
-}
-else
-{
-// The services configuration root element must be
'{SERVICES_CONFIG_ELEMENT}'.
-ConfigurationException e = new ConfigurationException();
-e.setMessage(INVALID_SERVICES_ROOT, new
Object[]{SERVICES_CONFIG_ELEMENT});
-throw e;
-}
-}
-
-private void clusters(Node root)
-{
-Node clusteringNode = selectSingleNode(root, CLUSTERS_ELEMENT);
-if (clusteringNode != null)
-{
-allowedAttributesOrElements(clusteringNode, CLUSTERING_CHILDREN);
-
-NodeList clusters = selectNodeList(clusteringNode,
CLUSTER_DEFINITION_ELEMENT);
-for (int i = 0; i < clusters.getLength(); i++)
-{
-Node cluster = clusters.item(i);
-requiredAttributesOrElements(cluster,
CLUSTER_DEFINITION_CHILDREN);
-String clusterName = getAttributeOrChildElement(cluster,
ID_ATTR);
-if (!isValidID(clusterName))
-continue;
-
-String propsFileName = getAttributeOrChildElement(cluster,
CLUSTER_PROPERTIES_ATTR);
-ClusterSettings clusterSettings = new ClusterSettings();
-clusterSettings.setClusterName(clusterName);
-clusterSettings.setPropsFileName(propsFileName);
-String className = getAttributeOrChildElement(cluster,
CLASS_ATTR);
-if (className != null && className.length() > 0)
-clusterSettings.setImplementationClass(className);
-
-String defaultValue = getAttributeOrChildElement(cluster,
[49/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/messaging/config/ClientConfigurationParser.java
--
diff --git a/common/src/flex/messaging/config/ClientConfigurationParser.java
b/common/src/flex/messaging/config/ClientConfigurationParser.java
deleted file mode 100644
index cff5d47..000
--- a/common/src/flex/messaging/config/ClientConfigurationParser.java
+++ /dev/null
@@ -1,951 +0,0 @@
-/*
- * 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 flex.messaging.config;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * A special mxmlc compiler specific implentation of the configuration
- * parser for JDK 1.4. Only a small subset of the configuration is
- * processed to generate the information that the client needs at runtime,
- * such as channel definitions and service destination properties.
- *
- *
- */
-public abstract class ClientConfigurationParser extends
AbstractConfigurationParser
-{
-protected void parseTopLevelConfig(Document doc)
-{
-Node root = selectSingleNode(doc, "/" + SERVICES_CONFIG_ELEMENT);
-
-if (root != null)
-{
-// Validation
-allowedChildElements(root, SERVICES_CONFIG_CHILDREN);
-
-// Channels (parse before services)
-channelsSection(root);
-
-// Services
-services(root);
-
-// Clustering
-clusters(root);
-
-// FlexClient
-flexClient(root);
-}
-}
-
-private void channelsSection(Node root)
-{
-Node channelsNode = selectSingleNode(root, CHANNELS_ELEMENT);
-if (channelsNode != null)
-{
-// Validation
-allowedAttributesOrElements(channelsNode, CHANNELS_CHILDREN);
-
-NodeList channels = selectNodeList(channelsNode,
CHANNEL_DEFINITION_ELEMENT);
-for (int i = 0; i < channels.getLength(); i++)
-{
-Node channel = channels.item(i);
-channelDefinition(channel);
-}
-NodeList includes = selectNodeList(channelsNode,
CHANNEL_INCLUDE_ELEMENT);
-for (int i = 0; i < includes.getLength(); i++)
-{
-Node include = includes.item(i);
-channelInclude(include);
-}
-}
-}
-
-private void channelDefinition(Node channel)
-{
-// Validation
-requiredAttributesOrElements(channel, CHANNEL_DEFINITION_REQ_CHILDREN);
-allowedAttributesOrElements(channel, CHANNEL_DEFINITION_CHILDREN);
-
-String id = getAttributeOrChildElement(channel, ID_ATTR).trim();
-if (isValidID(id))
-{
-// Don't allow multiple channels with the same id
-if (config.getChannelSettings(id) != null)
-{
-// Cannot have multiple channels with the same id ''{0}''.
-ConfigurationException e = new ConfigurationException();
-e.setMessage(DUPLICATE_CHANNEL_ERROR, new Object[]{id});
-throw e;
-}
-
-ChannelSettings channelSettings = new ChannelSettings(id);
-
-// Endpoint
-Node endpoint = selectSingleNode(channel, ENDPOINT_ELEMENT);
-if (endpoint != null)
-{
-// Endpoint Validation
-allowedAttributesOrElements(endpoint, ENDPOINT_CHILDREN);
-
-// The url attribute may also be specified by the deprecated
uri attribute
-String uri = getAttributeOrChildElement(endpoint, URL_ATTR);
-if (uri == null || EMPTY_STRING.equals(uri))
-uri = getAttributeOrChildElement(endpoint, URI_ATTR);
-channelSettings.setUri(uri);
-
-config.addChannelSettings(id, channelSettings);
-}
-
-channelServerOnlyAttribute(channel, channelSettings);
-
-// Add the channel properties
[43/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/main/java/flex/messaging/config/FlexClientSettings.java
--
diff --git a/common/src/main/java/flex/messaging/config/FlexClientSettings.java
b/common/src/main/java/flex/messaging/config/FlexClientSettings.java
new file mode 100644
index 000..bba7e5a
--- /dev/null
+++ b/common/src/main/java/flex/messaging/config/FlexClientSettings.java
@@ -0,0 +1,134 @@
+/*
+ * 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 flex.messaging.config;
+
+/**
+ *
+ */
+public class FlexClientSettings extends PropertiesSettings
+{
+
//--
+//
+// Constructor
+//
+
//--
+
+/**
+ * Constructs a FlexClientSettings instance.
+ */
+public FlexClientSettings()
+{
+// Empty for now.
+}
+
+
//--
+//
+// Properties
+//
+
//--
+
+private long timeoutMinutes = -1;
+
+/**
+ * Returns the number of minutes before an idle FlexClient is timed out.
+ *
+ * @return The number of minutes before an idle FlexClient is timed out.
+ */
+public long getTimeoutMinutes()
+{
+return timeoutMinutes;
+}
+
+/**
+ * Sets the number of minutes before an idle FlexClient is timed out.
+ *
+ * @param value The number of minutes before an idle FlexClient is timed
out.
+ */
+public void setTimeoutMinutes(long value)
+{
+timeoutMinutes = value;
+}
+
+private String flexClientOutboundQueueProcessorClassName;
+
+/**
+ * Returns the name of the default
FlexClientOutboundQueueProcessorClass.
+ *
+ * @return The the name of the default
FlexClientOutboundQueueProcessorClass.
+ */
+public String getFlexClientOutboundQueueProcessorClassName()
+{
+return flexClientOutboundQueueProcessorClassName;
+}
+
+/**
+ * Sets the name of the default
FlexClientOutboundQueueProcessor.
+ *
+ * @param flexClientOutboundQueueProcessorClassName The name of the
default FlexClientOutboundQueueProcessor.
+ */
+public void setFlexClientOutboundQueueProcessorClassName(String
flexClientOutboundQueueProcessorClassName)
+{
+this.flexClientOutboundQueueProcessorClassName =
flexClientOutboundQueueProcessorClassName;
+}
+
+private ConfigMap flexClientOutboundQueueProcessorProperties;
+
+/**
+ * Returns the properties for the default
FlexClientOutboundQueueProcessor.
+ *
+ * @return The properties for the default
FlexClientOutboundQueueProcessor.
+ */
+public ConfigMap getFlexClientOutboundQueueProcessorProperties()
+{
+return flexClientOutboundQueueProcessorProperties;
+}
+
+/**
+ * Sets the properties for the default
FlexClientOutboundQueueProcessor.
+ *
+ * @param flexClientOutboundQueueProcessorProperties properties for the
default
+ *
FlexClientOutboundQueueProcessor
+ */
+public void setFlexClientOutboundQueueProcessorProperties(ConfigMap
flexClientOutboundQueueProcessorProperties)
+{
+this.flexClientOutboundQueueProcessorProperties =
flexClientOutboundQueueProcessorProperties;
+}
+
+private int reliableReconnectDurationMillis;
+
+public int getReliableReconnectDurationMillis()
+{
+return reliableReconnectDurationMillis;
+}
+
+public void setReliableReconnectDurationMillis(int value)
+{
+reliableReconnectDurationMillis = value;
+}
+
+private int heartbeatIntervalMillis;
+
+public int getHeartbeatIntervalMillis()
+{
+return heartbeatIntervalMillis;
+}
+
+public void setHeartbeatIntervalMillis(int value)
+{
+heartbeatIntervalMillis = value;
+}
+}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/commo
[31/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/client/FlexClient.java
--
diff --git a/core/src/flex/messaging/client/FlexClient.java
b/core/src/flex/messaging/client/FlexClient.java
deleted file mode 100644
index e212986..000
--- a/core/src/flex/messaging/client/FlexClient.java
+++ /dev/null
@@ -1,2240 +0,0 @@
-/*
- * 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 flex.messaging.client;
-
-import flex.messaging.ConnectionAwareSession;
-import flex.messaging.FlexContext;
-import flex.messaging.FlexSession;
-import flex.messaging.FlexSessionListener;
-import flex.messaging.HttpFlexSession;
-import flex.messaging.MessageClient;
-import flex.messaging.MessageClientListener;
-import flex.messaging.MessageException;
-import flex.messaging.endpoints.Endpoint;
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-import flex.messaging.messages.CommandMessage;
-import flex.messaging.messages.Message;
-import flex.messaging.services.MessageService;
-import flex.messaging.util.StringUtils;
-import flex.messaging.util.TimeoutAbstractObject;
-
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Represents a Flex client application instance on the server.
- */
-public class FlexClient extends TimeoutAbstractObject implements
FlexSessionListener, MessageClientListener
-{
-
//--
-//
-// Public Static Constants
-//
-
//--
-
-/**
- * Log category for FlexClient related messages.
- */
-public static final String FLEX_CLIENT_LOG_CATEGORY =
LogCategories.CLIENT_FLEXCLIENT;
-
-/**
- * This value is passed to the server in an initial client connect to
- * indicate that the client needs a server-assigned FlexClient Id.
- *
- */
-public static final String NULL_FLEXCLIENT_ID = "nil";
-
-
//--
-//
-// Private Static Constants
-//
-
//--
-
-/**
- * Error string constants.
- */
-private static final int FLEX_CLIENT_INVALIDATED = 10027;
-private static final int ENDPOINT_PUSH_HANDLER_ALREADY_REGISTERED = 10033;
-
-private static final String POLL_WAIT_THREAD_NAME_EXTENSION =
"-in-poll-wait";
-
-
//--
-//
-// Private Static Variables
-//
-
//--
-
-/**
- * List of registered FlexClient created listeners.
- */
-private static final CopyOnWriteArrayList
createdListeners = new CopyOnWriteArrayList();
-
-
//--
-//
-// Public Static Methods
-//
-
//--
-
-/**
- * Adds a create listener that will be notified when new FlexClients
- * are created.
- *
- * @see flex.messaging.client.FlexClientListener
- *
- * @param listener The listener to add.
- */
-public static void addClientCreatedListener(FlexClientListener listener)
-{
-if (listener != null)
-createdListeners.addIfAbsent(listener);
-}
-
-/**
- * Removes a FlexClient created listener.
- *
- * @see flex.messaging.client.FlexClientListener
- *
- * @param listener The listener to remove.
- */
-public static void removeClientCreatedListener(FlexClientListener listener)
-{
-if (listener != null)
-createdListeners.remove(listener);
-
[15/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amf/translator/decoder/StringDecoder.java
--
diff --git
a/core/src/flex/messaging/io/amf/translator/decoder/StringDecoder.java
b/core/src/flex/messaging/io/amf/translator/decoder/StringDecoder.java
deleted file mode 100644
index 2b3219b..000
--- a/core/src/flex/messaging/io/amf/translator/decoder/StringDecoder.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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 flex.messaging.io.amf.translator.decoder;
-
-/**
- * Decode an ActionScript String, Number or Boolean to a Java String.
- *
- *
- */
-public class StringDecoder extends ActionScriptDecoder
-{
-public StringDecoder()
-{
-}
-
-public Object decodeObject(Object shell, Object encodedObject, Class
desiredClass)
-{
-if (encodedObject instanceof String)
-{
-return encodedObject;
-}
-else if (encodedObject instanceof Number)
-{
-return String.valueOf(((Number)encodedObject).doubleValue());
-}
-else if (encodedObject instanceof Boolean)
-{
-Boolean bool = (Boolean)encodedObject;
-if (bool.booleanValue())
-{
-return "true";
-}
-else
-{
-return "false";
-}
-}
-
-return shell;
-}
-}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amf/translator/decoder/TypedObjectDecoder.java
--
diff --git
a/core/src/flex/messaging/io/amf/translator/decoder/TypedObjectDecoder.java
b/core/src/flex/messaging/io/amf/translator/decoder/TypedObjectDecoder.java
deleted file mode 100644
index c6d9388..000
--- a/core/src/flex/messaging/io/amf/translator/decoder/TypedObjectDecoder.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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 flex.messaging.io.amf.translator.decoder;
-
-import java.util.Iterator;
-import java.util.List;
-
-import flex.messaging.util.ClassUtil;
-import flex.messaging.io.PropertyProxy;
-import flex.messaging.io.PropertyProxyRegistry;
-import flex.messaging.io.TypeMarshallingContext;
-import flex.messaging.io.amf.translator.TranslationException;
-
-/**
- * Decodes an ASObject to a Java object based on the
- * type information returned from the ASObject.getType().
- *
- * If the TranslationContext has been set up to support
- * _remoteClass then this property may be used as a back up.
- *
- *
- */
-public class TypedObjectDecoder extends ActionScriptDecoder
-{
-public boolean hasShell()
-{
-return true;
-}
-
-public Object createShell(Object encodedObject, Class desiredClass)
-{
-Object shell = null;
-
-Class cls;
-String type = TypeMarshallingContext.getType(encodedObject);
-
-if (type != null)
-{
-TypeMarshallingContext context =
TypeMarshallingContext.getTypeMarshallingContext();
- cls = ClassUtil.createClass(type, context.getClassLoader());
-}
-else
-{
-cls = desiredClass;
-}
-
-shell = ClassUtil.createDefaultInstance(cls, null);
-
-return shell;
-}
-
-public Object decodeObject(Object shell,
[40/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/management/BaseControl.java
--
diff --git a/core/src/flex/management/BaseControl.java
b/core/src/flex/management/BaseControl.java
deleted file mode 100644
index a66a104..000
--- a/core/src/flex/management/BaseControl.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * 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 flex.management;
-
-import flex.management.runtime.AdminConsoleDisplayRegistrar;
-import flex.messaging.FlexContext;
-
-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
-import javax.management.MBeanRegistration;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ObjectName;
-import javax.servlet.ServletConfig;
-
-/**
- * The implementation of the BaseControlMBean interface. This
- * abstract class provides the core functionality that all Flex control MBeans
- * require.
- *
- * Defining concrete implementations of getId() and
- * getType() are left to subclasses, but this base class does
- * provide access to the parent MBean for each instance. This class also
- * implements the MBeanRegistration interface, and it
- * automatically stores a reference to the MBean server in each instance upon
- * registration. Subclasses may choose to override none, any, or all of the
- * methods defined by the MBeanRegistration interface, but any
- * overrides should be sure to invoke the overridden method with a call to
their
- * superclass.
- *
- * The register() method provides a simple and consistent way to
- * register instances with the MBean server, and the
- * getObjectName() method gaurantees consistent, well-formed
- * ObjectNames for all MBean instances.
- */
-public abstract class BaseControl implements BaseControlMBean,
-MBeanRegistration
-{
-/**
- * The prefix used for the domain part of control MBean names.
- */
-public static final String DOMAIN_PREFIX = "flex.runtime";
-private static final int MALFORMED_OBJECTNAME = 10400;
-private static final int UNREG_EXCEPTION = 10401;
-private static final int UNREG_NOTFOUND = 10402;
-private static final int REG_EXCEPTION = 10403;
-private static final int REG_ALREADYEXISTS = 10404;
-private static final int REG_NOTCOMPLIANT = 10405;
-private static final int DISABLE_MANAGEMENT = 10426;
-
-protected Date startTimestamp;
-private BaseControl parent;
-private ObjectName objectName;
-private ObjectName registeredObjectName;
-private MBeanServer server;
-private boolean registered = false;
-
-private AdminConsoleDisplayRegistrar registrar;
-
-// Implements flex.management.BaseControlMBean.getId; inherits javadoc
-// specification.
-public abstract String getId();
-
-// Implements flex.management.BaseControlMBean.getType; inherits javadoc
-// specification.
-public abstract String getType();
-
-// Implements flex.management.BaseControlMBean.getParent; inherits javadoc
-// specification.
-public final ObjectName getParent()
-{
-return (parent != null) ? parent.getObjectName() : null;
-}
-
-/**
- * Returns an identifier for the application that hosts the component that
- * this control manages.
- *
- * @return An identifier for the application that hosts the component this
- * control manages.
- */
-public String getApplicationId()
-{
-String id = null;
-// Our base implementation attempts to use the current servlet context
-// name as our application identifier.
-ServletConfig config = FlexContext.getServletConfig();
-if (config != null)
-{
-id = config.getServletContext().getServletContextName();
-}
-return (id != null) ? id.replace(":", "") : "";
-}
-
-/**
- * Set the register object.
-
[39/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/management/jmx/MBeanServerGateway.java
--
diff --git a/core/src/flex/management/jmx/MBeanServerGateway.java
b/core/src/flex/management/jmx/MBeanServerGateway.java
deleted file mode 100644
index f60c401..000
--- a/core/src/flex/management/jmx/MBeanServerGateway.java
+++ /dev/null
@@ -1,906 +0,0 @@
-/*
- * 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 flex.management.jmx;
-
-import flex.management.BaseControl;
-import flex.management.MBeanServerLocatorFactory;
-import flex.management.ManagementException;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.IntrospectionException;
-import javax.management.InvalidAttributeValueException;
-import javax.management.MalformedObjectNameException;
-import javax.management.MBeanException;
-import javax.management.MBeanRegistrationException;
-import javax.management.MBeanServer;
-import javax.management.NotCompliantMBeanException;
-import javax.management.ReflectionException;
-import javax.management.RuntimeOperationsException;
-
-/**
- * Remoting gateway to the MBean server that hosts Flex MBeans.
- *
- * Some base javax.management.MBeanServer methods are unimplemented due to the
- * fact that we're interacting with the MBean server from remote Flash clients.
- * Some methods have been modified to better suite remote Flash clients. Other
- * methods are additive, serving as a convenience for Flex applications.
- *
- * Unimplemented methods from the base MBeanServer API:
- *
- * getDomains() - JMX 1.2
- * addNotificationListener()/removeNotificationListener() - Flash objects
- * cannot listen directly for MBean notifications.
- * instantiate() - returns a reference to a Java object that is not
useful
- * to a remote Flash client.
- * deserialize() - deprecated.
- * getClassLoaderFor() - meaningless to a Flash client.
- * getClassLoader() - meaningless to a Flash client.
- * getClassLoaderRepository() - meaningless to a Flash client.
- *
- *
- * Modifications to the base MBeanServer API:
- *
- * * All ObjectName arguments are typed as String because serialization
in either
- * direction doesn't support ObjectNames that are patterns. This does
not effect
- * ObjectNames that are not patterns that are returned to the
client.
- * queryMBeans() - returns an Array of ObjectInstances rather than a
java.util.Set
- * and does not currently support the QueryExp argument.
- * queryNames() returns an Array of ObjectNames rather than a
java.util.Set
- * and does not currently support the QueryExp argument.
- * getAttributes() returns an Array of Attributes rather than an
AttributeList.
- * setAttributes() accepts and returns Arrays of Attributes rather than
AttributeLists.
- *
- *
- * Additonal Flex-specific methods:
- *
- * getFlexMBeanCount()
- * getFlexDomains()
- * getFlexMBeanObjectNames()
- *
- */
-public class MBeanServerGateway
-{
-// Error string constants.
-private static final int MALFORMED_OBJECTNAME = 10400;
-private static final int GETINFO_INTROSPECTION_ERR = 10406;
-private static final int MBEAN_NOTFOUND = 10407;
-private static final int GETINFO_REFLECT_ERR = 10408;
-private static final int ATTRIB_NOTFOUND = 10409;
-private static final int GETATTRIB_EXCEPTION = 10410;
-private static final int GETATTRIB_REFLECT_ERR = 10411;
-private static final int GETATTRIB_NULL_ARGUMENT = 10412;
-private static final int GETATTRIBS_REFLECT_ERR = 10413;
-private static final int GETATTRIBS_NULL_ARGUMENT = 10414;
-private static final int INVOKE_REFLECT_ERR = 10415;
-private static final int INVOKE_ERR = 10416;
-private static final int CREATE_ERR = 10417;
-private static final int INSTANCE_EXISTS = 10418;
-private static final int NOT_COMPLIANT = 10419;
-private static fi
[34/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/HttpFlexSessionProvider.java
--
diff --git a/core/src/flex/messaging/HttpFlexSessionProvider.java
b/core/src/flex/messaging/HttpFlexSessionProvider.java
deleted file mode 100644
index abdcb4c..000
--- a/core/src/flex/messaging/HttpFlexSessionProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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 flex.messaging;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import flex.messaging.log.Log;
-
-/**
- * Provider implementation for HttpFlexSessions.
- * Not intended for public use.
- */
-public class HttpFlexSessionProvider extends AbstractFlexSessionProvider
-{
-
//--
-//
-// Public Methods
-//
-
//--
-
-/**
- * Factory method to get an existing HttpFlexSession for the
current request,
- * or create and return a new HttpFlexSession if necessary.
- * The HttpFlexSession wraps the underlying J2EE
HttpSession.
- * Not intended for public use.
- *
- * @param request The current HttpServletRequest.
- * @return A HttpFlexSession.
- */
-public HttpFlexSession getOrCreateSession(HttpServletRequest request)
-{
-HttpFlexSession flexSession;
-HttpSession httpSession = request.getSession(true);
-
-if (!HttpFlexSession.isHttpSessionListener &&
!HttpFlexSession.warnedNoEventRedispatch)
-{
-HttpFlexSession.warnedNoEventRedispatch = true;
-if (Log.isWarn())
-
Log.getLogger(HttpFlexSession.WARN_LOG_CATEGORY).warn("HttpFlexSession has not
been registered as a listener in web.xml for this application so no events will
be dispatched to FlexSessionAttributeListeners or FlexSessionBindingListeners.
To correct this, register flex.messaging.HttpFlexSession as a listener in
web.xml.");
-}
-
-boolean isNew = false;
-synchronized (httpSession)
-{
-flexSession =
(HttpFlexSession)httpSession.getAttribute(HttpFlexSession.SESSION_ATTRIBUTE);
-if (flexSession == null)
-{
-flexSession = new HttpFlexSession(this);
-// Correlate this FlexSession to the HttpSession before
triggering any listeners.
-FlexContext.setThreadLocalSession(flexSession);
-httpSession.setAttribute(HttpFlexSession.SESSION_ATTRIBUTE,
flexSession);
-flexSession.setHttpSession(httpSession);
-isNew = true;
-}
-else
-{
-FlexContext.setThreadLocalSession(flexSession);
-if (flexSession.httpSession == null)
-{
-// httpSession is null if the instance is new or is from
-// serialization.
-flexSession.setHttpSession(httpSession);
-isNew = true;
-}
-}
-}
-
-if (isNew)
-{
-getFlexSessionManager().registerFlexSession(flexSession);
-flexSession.notifyCreated();
-
-if (Log.isDebug())
-
Log.getLogger(HttpFlexSession.FLEX_SESSION_LOG_CATEGORY).debug("FlexSession
created with id '" + flexSession.getId() + "' for an Http-based client
connection.");
-}
-
-return flexSession;
-}
-}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/MessageBroker.java
--
diff --git a/core/src/flex/messaging/MessageBroker.java
b/core/src/flex/messaging/MessageBroker.java
deleted file mode 100644
index 80b061e..000
--- a/core/src/flex/messaging/MessageBroker.java
+++ /dev/null
@@ -1,2252 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for addit
[37/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/management/runtime/messaging/services/ServiceControl.java
--
diff --git
a/core/src/flex/management/runtime/messaging/services/ServiceControl.java
b/core/src/flex/management/runtime/messaging/services/ServiceControl.java
deleted file mode 100644
index da3c605..000
--- a/core/src/flex/management/runtime/messaging/services/ServiceControl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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 flex.management.runtime.messaging.services;
-
-import flex.management.BaseControl;
-import flex.management.runtime.messaging.MessageBrokerControl;
-import flex.messaging.Destination;
-import flex.messaging.services.Service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.management.ObjectName;
-
-/**
- * The ServiceControl class is the MBean implementation for
- * monitoring and managing a Service at runtime.
- */
-public abstract class ServiceControl extends BaseControl implements
ServiceControlMBean
-{
-protected Service service;
-private List destinations;
-
-/**
- * Constructs a ServiceControl, assigning its id, managed
service and
- * parent MBean.
- *
- * @param service The Service managed by this MBean.
- * @param parent The parent MBean in the management hierarchy.
- */
-public ServiceControl(Service service, BaseControl parent)
-{
-super(parent);
-this.service = service;
-destinations = new ArrayList();
-}
-
-/*
- * (non-Javadoc)
- * @see flex.management.BaseControlMBean#getId()
- */
-public String getId()
-{
-return service.getId();
-}
-
-/*
- * (non-Javadoc)
- * @see flex.management.runtime.ServiceControlMBean#isRunning()
- */
-public Boolean isRunning()
-{
-return Boolean.valueOf(service.isStarted());
-}
-
-
-/**
- * Adds the ObjectName of a destination registered with the
managed service.
- *
- * @param value The ObjectName of a destination registered
with the managed service.
- */
-public void addDestination(ObjectName value)
-{
-destinations.add(value);
-}
-
-/**
- * Removes the ObjectName of a destination registered with
the managed service.
- *
- * @param value The ObjectName of a destination registered
with the managed service.
- */
-public void removeDestination(ObjectName value)
-{
-destinations.remove(value);
-}
-
-/*
- * (non-Javadoc)
- * @see flex.management.runtime.ServiceControlMBean#getDestinations()
- */
-public ObjectName[] getDestinations()
-{
-int size = destinations.size();
-ObjectName[] destinationNames = new ObjectName[size];
-for (int i = 0; i < size; ++i)
-{
-destinationNames[i] = (ObjectName)destinations.get(i);
-}
-return destinationNames;
-}
-
-
-/*
- * (non-Javadoc)
- * @see flex.management.runtime.ServiceControlMBean#getStartTimestamp()
- */
-public Date getStartTimestamp()
-{
-return startTimestamp;
-}
-
-
-/*
- * (non-Javadoc)
- * @see javax.management.MBeanRegistration#preDeregister()
- */
-public void preDeregister() throws Exception
-{
-MessageBrokerControl parent = (MessageBrokerControl)getParentControl();
-parent.removeService(getObjectName());
-
-// Unregister destinations of the service
-for (Iterator iter = service.getDestinations().values().iterator();
iter.hasNext();) {
-Destination child = (Destination) iter.next();
-if (child.getControl() != null)
-{
-child.getControl().unregister();
-child.setControl(null);
-child.setManaged(false);
-}
-
-}
-
-super.preDeregister();
-}
-
-}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/f
[12/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/security/LoginCommandExt.java
--
diff --git a/core/src/flex/messaging/security/LoginCommandExt.java
b/core/src/flex/messaging/security/LoginCommandExt.java
deleted file mode 100644
index 6078180..000
--- a/core/src/flex/messaging/security/LoginCommandExt.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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 flex.messaging.security;
-
-/**
- * Extensions to the LoginCommand interface.
- */
-public interface LoginCommandExt
-{
-/**
- * Classes that implement the flex.messaging.security.LoginCommand
interface, should also
- * implement this interface if the name stored in java.security.Principal
created as a result
- * of a succesfull authentication differs from the username that is
actually passed in to
- * the authentication.
- *
- * Implementing this interace gives such LoginCommand's a chance to return
the resulting
- * username so that it can be compared to the one stored in Principal.
- *
- * Returns the value that would be returned by
java.security.Principal.getName() if
- * username/credentials had been authenticated
- *
- * @param username - User whose comparable name will be retrieved
- * @param credentials - Credentials for user whose comparable name will be
retrieved
- * @return - value that would be returned by
java.security.Principal.getName() if
- * username/credentials had been authenticated
- */
-String getPrincipalNameFromCredentials(String username, Object
credentials);
-
-}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/security/LoginManager.java
--
diff --git a/core/src/flex/messaging/security/LoginManager.java
b/core/src/flex/messaging/security/LoginManager.java
deleted file mode 100644
index 1f42ab6..000
--- a/core/src/flex/messaging/security/LoginManager.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * 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 flex.messaging.security;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.security.Principal;
-import java.util.List;
-
-import flex.messaging.FlexComponent;
-import flex.messaging.FlexContext;
-import flex.messaging.FlexSession;
-import flex.messaging.HttpFlexSession;
-import flex.messaging.config.ConfigMap;
-import flex.messaging.config.ConfigurationException;
-import flex.messaging.config.SecurityConstraint;
-import flex.messaging.endpoints.Endpoint;
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-
-/**
- * Much of this logic has been taken from the Flash Remoting Gateway.
- *
- * Since each application server manages sessions, users and security
- * differently, a separate LoginCommand needs to be written for
- * each server.
- *
- *
- *
- */
-public class LoginManager implements FlexComponent
-{
-/** Log category for LoginManager. */
-public static final String LOG_CATEGORY = LogCategories.SECURITY;
-
-private static final String NIOHTTP_FLEX_SESSION_TYPE =
"flex.messaging.endpoints.NIOHTTPFlexSession";
-private static final String INVALIDATE_METHOD = "invalidate";
-
-// Exception/error message numbers.
-private static f
[19/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amf/ActionContext.java
--
diff --git a/core/src/flex/messaging/io/amf/ActionContext.java
b/core/src/flex/messaging/io/amf/ActionContext.java
deleted file mode 100644
index 3b7d2a5..000
--- a/core/src/flex/messaging/io/amf/ActionContext.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * 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 flex.messaging.io.amf;
-
-import flex.messaging.io.MessageIOConstants;
-import flex.messaging.messages.MessagePerformanceInfo;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Serializable;
-
-/**
- * A context for reading and writing messages.
- *
- */
-public class ActionContext implements Serializable
-{
-static final long serialVersionUID = 2300156738426801921L;
-private int messageNumber;
-private ActionMessage requestMessage;
-private ActionMessage responseMessage;
-private ByteArrayOutputStream outBuffer;
-
-private int status;
-private int version;
-
-private boolean legacy;
-public boolean isPush;
-public boolean isDebug;
-
-/**
- *
- * Performance metrics related field, keeps track of bytes deserialized
using this context
- */
-private int deserializedBytes;
-
-/**
- *
- * Performance metrics related field, keeps track of bytes serialized
using this context
- */
-private int serializedBytes;
-
-/**
- *
- * Performance metrics related field, recordMessageSizes flag
- */
-private boolean recordMessageSizes;
-
-/**
- *
- * Performance metrics related field, recordMessageTimes flag
- */
-private boolean recordMessageTimes;
-
-/**
- *
- * Performance metrics related field, incoming MPI object, will only be
populated when one of
- * the record-message-* params is enabled
- */
-private MessagePerformanceInfo mpii;
-
-/**
- *
- * Performance metrics related field, outgoing MPI object, will only be
populated when one of
- * the record-message-* params is enabled
- */
-private MessagePerformanceInfo mpio;
-
-public ActionContext()
-{
-status = MessageIOConstants.STATUS_OK;
-}
-
-public boolean isLegacy()
-{
-return legacy;
-}
-
-public void setLegacy(boolean legacy)
-{
-this.legacy = legacy;
-}
-
-public int getMessageNumber()
-{
-return messageNumber;
-}
-
-public void setMessageNumber(int messageNumber)
-{
-this.messageNumber = messageNumber;
-}
-
-public MessageBody getRequestMessageBody()
-{
-return requestMessage.getBody(messageNumber);
-}
-
-public ActionMessage getRequestMessage()
-{
-return requestMessage;
-}
-
-public void setRequestMessage(ActionMessage requestMessage)
-{
-this.requestMessage = requestMessage;
-}
-
-public ActionMessage getResponseMessage()
-{
-return responseMessage;
-}
-
-public MessageBody getResponseMessageBody()
-{
-return responseMessage.getBody(messageNumber);
-}
-
-public void setResponseMessage(ActionMessage responseMessage)
-{
-this.responseMessage = responseMessage;
-}
-
-public void setResponseOutput(ByteArrayOutputStream out)
-{
-outBuffer = out;
-}
-
-public ByteArrayOutputStream getResponseOutput()
-{
-return outBuffer;
-}
-
-public int getStatus()
-{
-return status;
-}
-
-public void setStatus(int status)
-{
-this.status = status;
-}
-
-public void setVersion(int v)
-{
-version = v;
-}
-
-public int getVersion()
-{
-return version;
-}
-
-public void incrementMessageNumber()
-{
-messageNumber++;
-}
-
-public int getDeserializedBytes()
-{
-return deserializedBytes;
-}
-
-public void setDeserializedBytes(int deserializedBytes)
-{
-this.deserializedBytes = deserializedBytes;
-}
-
-public int getSerializedBytes()
-{
-return serializedBytes;
-
[46/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/flex/messaging/log/Logger.java
--
diff --git a/common/src/flex/messaging/log/Logger.java
b/common/src/flex/messaging/log/Logger.java
deleted file mode 100644
index 8684a3e..000
--- a/common/src/flex/messaging/log/Logger.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * 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 flex.messaging.log;
-
-import flex.messaging.util.PrettyPrinter;
-import flex.messaging.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- * The Logger class is used to log out information. It provides
named
- * methods to log information out at the desired level. Each
Logger
- * will log information out for a log category that is settable.
- *
- *
- */
-public class Logger
-{
-/**
- * The category this logger send messages for.
- */
-private volatile String category;
-
-/**
- * The list of targets that this logger will dispatch log events to.
- */
-private final ArrayList targets;
-
-/**
- * Constructs a Logger instance that will log
- * information out to the specified category.
- *
- * @param category The category to log information for.
- */
-public Logger(String category)
-{
-this.category = category;
-targets = new ArrayList();
-}
-
-/**
- * Returns the category this Logger logs information for.
- *
- * @return The category this Logger logs information for.
- */
-public String getCategory()
-{
-return category;
-}
-
-/**
- * Determines whether the Logger has at least one target.
- *
- * @return True if the Logger has one or more targets.
- */
-public boolean hasTarget()
-{
-synchronized (targets)
-{
-return !targets.isEmpty();
-}
-}
-/**
- * Adds a Target that will format and output log events
- * generated by this Logger.
- *
- * @param target The Target to add.
- */
-void addTarget(Target target)
-{
-synchronized (targets)
-{
-if (!targets.contains(target))
-targets.add(target);
-}
-}
-
-/**
- * Removes a Target from this Logger.
- *
- * @param target The Target to remove.
- */
-void removeTarget(Target target)
-{
-synchronized (targets)
-{
-targets.remove(target);
-}
-}
-
-/*
- * DEBUG
- */
-/**
- * Logs out a debug message.
- *
- * @param message The message to log.
- */
-public void debug(String message)
-{
-log(LogEvent.DEBUG, message, null, null);
-}
-
-/**
- * Logs out a debug message associated with a Throwable.
- *
- * @param message The message to log.
- * @param t The associated Throwable.
- */
-public void debug(String message, Throwable t)
-{
-log(LogEvent.DEBUG, message, null, t);
-}
-
-/**
- * Logs out a debug message supporting positional parameter substitutions.
- *
- * @param message The message to log.
- * @param parameters Parameters to substitute into the message.
- */
-public void debug(String message, Object[] parameters)
-{
-log(LogEvent.DEBUG, message, parameters, null);
-}
-
-/**
- * Logs out a debug message supporting positional parameter substitutions
and an
- * associated Throwable.
- *
- * @param message The message to log.
- * @param parameters Parameters to substitute into the message.
- * @param t The associated Throwable.
- */
-public void debug(String message, Object[] parameters, Throwable t)
-{
-log(LogEvent.DEBUG, message, parameters, t);
-}
-
-/*
- * INFO
- */
-/**
- * Logs out an info message.
- *
- * @param message The message to log.
- */
-public void info(String message)
-{
-log(LogEvent.INFO, message, null, null);
-}
-
-/**
- * Logs out an info message associated with a Throwable.
- *
- * @param message The me
[02/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/main/java/flex/management/runtime/messaging/log/LogManager.java
--
diff --git
a/core/src/main/java/flex/management/runtime/messaging/log/LogManager.java
b/core/src/main/java/flex/management/runtime/messaging/log/LogManager.java
new file mode 100644
index 000..b9c63b5
--- /dev/null
+++ b/core/src/main/java/flex/management/runtime/messaging/log/LogManager.java
@@ -0,0 +1,260 @@
+/*
+ * 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 flex.management.runtime.messaging.log;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.lang.reflect.Field;
+
+import flex.management.ManageableComponent;
+import flex.messaging.config.ConfigurationException;
+import flex.messaging.log.Log;
+import flex.messaging.log.LogCategories;
+import flex.messaging.log.Target;
+
+
+/**
+ * The LogManager is an interface between the Log and the LogControl which
exists
+ * because Log lives in the common package, so it cannot extend
ManageableComponent itself,
+ * which is necessary for a class to be exposed through MBeans.
+ */
+public class LogManager extends ManageableComponent
+{
+
+private static final String LOG_CATEGORY = LogCategories.CONFIGURATION; //
Log category used by LogManager (ManageableComponent)
+private static final int NULL_LOG_REF_EXCEPTION = 10031;
+
+private Log log;
+private String ID = "log";
+private CategoryManager categoryManager;
+private LogControl controller;
+
+private boolean isSetup;
+
+/**
+ * Public constructor required by ManageableComponent.
+ */
+public LogManager()
+{
+this(true);
+}
+
+public LogManager(boolean enableManagement)
+{
+super(enableManagement);
+setId(ID);
+
+categoryManager = new CategoryManager();
+
+}
+
+
+public void setupLogControl()
+{
+if (!isSetup)
+{
+controller = new LogControl(getParent().getControl(), this);
+setControl(controller);
+controller.register();
+isSetup = true;
+}
+}
+
+public void stop()
+{
+if (!isStarted())
+{
+return;
+}
+
+
+super.stop();
+
+// Remove management
+if (isManaged())
+{
+if (getControl() != null)
+{
+getControl().unregister();
+setControl(null);
+}
+setManaged(false);
+}
+}
+
+public void setLog(Log logInstance)
+{
+log = logInstance;
+}
+
+/* (non-Javadoc)
+ * @see flex.management.ManageableComponent#getLogCategory()
+ */
+protected String getLogCategory()
+{
+return LOG_CATEGORY;
+}
+
+/**
+ * Gets the Loggers as a string array.
+ * @return a String array
+ */
+public String[] getLoggers()
+{
+return log.getLoggers();
+}
+
+/**
+ * Gets the Target IDs.
+ * @return a string array
+ */
+public String[] getTargetIds()
+{
+return (String[]) Log.getTargetMap().keySet().toArray(new String[0]);
+}
+
+/**
+ * Get a Target for a targetId.
+ *
+ * @param targetId the target ID
+ * @return the target from the Log, or null if it is not found
+ */
+public Target getTarget(String targetId)
+{
+return (Target) Log.getTargetMap().get(targetId);
+}
+
+/**
+ * Gets the filters for a given target.
+ * @param targetId the target ID
+ * @return a string array
+ */
+public String[] getTargetFilters(String targetId)
+{
+
+Target target = getTarget(targetId);
+
+if (target == null)
+return new String[0];
+
+List filterObjects = target.getFilters();
+String[] filters = new String[filterObjects.size()];
+for (int i = 0; i < filterObjects.size(); i++)
+{
+filters[i] = (String)filterObjects.get(i);
+}
+
+return filters;
+}
+
+/**
+ * Check whether a filter is valid.
+ * @param filter
[05/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java
--
diff --git
a/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java
b/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java
deleted file mode 100644
index 3298507..000
--- a/core/src/flex/messaging/util/concurrent/DefaultThreadPoolExecutor.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * 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 flex.messaging.util.concurrent;
-
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.RejectedExecutionException;
-
-/**
- * Implements {@link Executor} and extends the ThreadPoolExecutor
provided by the
- * Java 1.4.x-friendly backport of the java.util.concurrent API.
- *
- *
- */
-public class DefaultThreadPoolExecutor extends ThreadPoolExecutor implements
Executor
-{
-
//--
-//
-// Constructors
-//
-
//--
-
-/**
- * Constructs a DefaultThreadPoolExecutor with configuration
that
- * matches the return from {@link
java.util.concurrent.Executors#newCachedThreadPool()}.
- */
-public DefaultThreadPoolExecutor()
-{
-super(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new
SynchronousQueue());
-}
-
-/**
- * @see java.util.concurrent.ThreadPoolExecutor#ThreadPoolExecutor(int,
int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue)
- */
-public DefaultThreadPoolExecutor(int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit, BlockingQueue workQueue)
-{
-super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue);
-}
-
-/**
- * @see java.util.concurrent.ThreadPoolExecutor#ThreadPoolExecutor(int,
int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue,
java.util.concurrent.RejectedExecutionHandler)
- */
-public DefaultThreadPoolExecutor(int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit, BlockingQueue workQueue,
RejectedExecutionHandler handler)
-{
-super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
handler);
-}
-
-/**
- * @see java.util.concurrent.ThreadPoolExecutor#ThreadPoolExecutor(int,
int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue,
java.util.concurrent.ThreadFactory)
- */
-public DefaultThreadPoolExecutor(int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, ThreadFactory
threadFactory)
-{
-super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
threadFactory);
-}
-
-/**
- * @see java.util.concurrent.ThreadPoolExecutor#ThreadPoolExecutor(int,
int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue,
java.util.concurrent.ThreadFactory,
java.util.concurrent.RejectedExecutionHandler)
- */
-public DefaultThreadPoolExecutor(int corePoolSize, int maximumPoolSize,
long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, ThreadFactory
threadFactory, RejectedExecutionHandler handler)
-{
-super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue,
threadFactory, handler);
-}
-
-
//--
-//
-// Variables
-//
-
//--
-
-/**
- * Instance-level lock.
- */
-private final Object lock = new Object();
-
-
//--
[25/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/endpoints/AbstractEndpoint.java
--
diff --git a/core/src/flex/messaging/endpoints/AbstractEndpoint.java
b/core/src/flex/messaging/endpoints/AbstractEndpoint.java
deleted file mode 100644
index c265ea9..000
--- a/core/src/flex/messaging/endpoints/AbstractEndpoint.java
+++ /dev/null
@@ -1,1513 +0,0 @@
-/*
- * 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 flex.messaging.endpoints;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import flex.management.ManageableComponent;
-import flex.management.runtime.messaging.MessageBrokerControl;
-import flex.management.runtime.messaging.endpoints.EndpointControl;
-import flex.messaging.FlexContext;
-import flex.messaging.FlexSession;
-import flex.messaging.MessageBroker;
-import flex.messaging.MessageException;
-import flex.messaging.Server;
-import flex.messaging.client.FlexClient;
-import flex.messaging.client.FlexClientOutboundQueueProcessor;
-import flex.messaging.client.FlushResult;
-import flex.messaging.client.PollFlushResult;
-import flex.messaging.client.UserAgentSettings;
-import flex.messaging.config.ChannelSettings;
-import flex.messaging.config.ConfigMap;
-import flex.messaging.config.ConfigurationConstants;
-import flex.messaging.config.ConfigurationException;
-import flex.messaging.config.SecurityConstraint;
-import flex.messaging.io.ClassAliasRegistry;
-import flex.messaging.io.SerializationContext;
-import flex.messaging.io.TypeMarshaller;
-import flex.messaging.io.TypeMarshallingContext;
-import flex.messaging.io.amf.translator.ASTranslator;
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-import flex.messaging.log.Logger;
-import flex.messaging.messages.AcknowledgeMessage;
-import flex.messaging.messages.AcknowledgeMessageExt;
-import flex.messaging.messages.AsyncMessage;
-import flex.messaging.messages.AsyncMessageExt;
-import flex.messaging.messages.CommandMessage;
-import flex.messaging.messages.CommandMessageExt;
-import flex.messaging.messages.Message;
-import flex.messaging.messages.SmallMessage;
-import flex.messaging.security.SecurityException;
-import flex.messaging.util.ClassUtil;
-import flex.messaging.util.StringUtils;
-import flex.messaging.util.UserAgentManager;
-import flex.messaging.validators.DeserializationValidator;
-
-/**
- * This is the default implementation of Endpoint, which provides a convenient
- * base for behavior and associations common to all endpoints.
- *
- * These properties that appear in the endpoint configuration are only used by
the
- * client, therefore they have to be set on the appropriate client classes:
connect-timeout-seconds set on Channel.
- *
- * @see flex.messaging.endpoints.Endpoint
- */
-public abstract class AbstractEndpoint extends ManageableComponent
-implements Endpoint2, ConfigurationConstants
-{
-/** Log category for AbstractEndpoint. */
-public static final String LOG_CATEGORY = LogCategories.ENDPOINT_GENERAL;
-
-/**
- * HTTP header field names.
- */
-public static final String HEADER_NAME_CACHE_CONTROL = "Cache-Control";
-public static final String HEADER_NAME_EXPIRES = "Expires";
-public static final String HEADER_NAME_PRAGMA = "Pragma";
-
-// Errors
-private static final int NONSECURE_PROTOCOL = 10066;
-private static final int REQUIRES_FLEXCLIENT_SUPPORT = 10030;
-private static final int ERR_MSG_INVALID_URL_SCHEME = 11100;
-
-// XML Configuration Properties
-private static final String SERIALIZATION = "serialization";
-private static final String CREATE_ASOBJECT_FOR_MISSING_TYPE =
"create-asobject-for-missing-type";
-private static final String CUSTOM_DESERIALIZER = "custom-deserializer";
-private static final String CUSTOM_SERIALIZER = "custom-serializer";
-private static final String ENABLE_SMALL_MESSAGES =
"enable-small-messages";
-private static final String TYPE_MARSHALLER = "type-marshaller";
-privat
[22/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/endpoints/amf/SerializationFilter.java
--
diff --git a/core/src/flex/messaging/endpoints/amf/SerializationFilter.java
b/core/src/flex/messaging/endpoints/amf/SerializationFilter.java
deleted file mode 100644
index c15ab89..000
--- a/core/src/flex/messaging/endpoints/amf/SerializationFilter.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * 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 flex.messaging.endpoints.amf;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
-
-import javax.servlet.http.HttpServletRequest;
-
-import flex.messaging.FlexContext;
-import flex.messaging.MessageException;
-import flex.messaging.io.MessageDeserializer;
-import flex.messaging.io.MessageIOConstants;
-import flex.messaging.io.MessageSerializer;
-import flex.messaging.io.SerializationContext;
-import flex.messaging.io.SerializationException;
-import flex.messaging.io.amf.ASObject;
-import flex.messaging.io.amf.ActionContext;
-import flex.messaging.io.amf.ActionMessage;
-import flex.messaging.io.amf.AmfTrace;
-import flex.messaging.io.amf.MessageBody;
-import flex.messaging.log.Log;
-import flex.messaging.log.LogCategories;
-import flex.messaging.log.Logger;
-import flex.messaging.messages.ErrorMessage;
-import flex.messaging.messages.Message;
-import flex.messaging.messages.MessagePerformanceInfo;
-import flex.messaging.util.ExceptionUtil;
-import flex.messaging.util.StringUtils;
-
-
-/**
- * Filter for serializing and deserializing action messages.
- */
-public class SerializationFilter extends AMFFilter
-{
-
//--
-//
-// Private Static Constants
-//
-
//--
-
-private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
-
-// Error codes.
-private static final int UNHANDLED_ERROR = 10306;
-private static final int REQUEST_ERROR = 10307;
-private static final int RESPONSE_ERROR = 10308;
-
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Constructs a SerializationFilter.
- *
- * @param logCategory Log category to use in logging. If
null, the default values is Endpoint.General.
- */
-public SerializationFilter(String logCategory)
-{
-if (logCategory == null)
-logCategory = LogCategories.ENDPOINT_GENERAL;
-logger = Log.getLogger(logCategory);
-}
-
-
//--
-//
-// Variables
-//
-
//--
-
-/**
- * Used to log serialization/deserialization messages.
- */
-private Logger logger;
-
-
//--
-//
-// Public Methods
-//
-
//--
-
-@Override
-public void invoke(final ActionContext context) throws IOException
-{
-boolean success = false;
-
-// Additional AMF packet tracing is enabled only at the debug logging
level
-// and only if there's a target listening for it.
-AmfTrace debugTrace = Log.isDebug() && logger.hasTarget()? new
AmfTrace() : null;
-
-// Create an empty ActionMessage object to hold our response
-context.setResponseMessage(new ActionMessage());
-SerializationContext sc =
SerializationContext.getSerializationContext();
-
-try
-{
-// Deserialize the input stream into an "ActionMessage" object.
-MessageDeserializer deserializer = sc.newMessageDeserializ
[30/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/client/FlexClientBindingEvent.java
--
diff --git a/core/src/flex/messaging/client/FlexClientBindingEvent.java
b/core/src/flex/messaging/client/FlexClientBindingEvent.java
deleted file mode 100644
index 3fa20de..000
--- a/core/src/flex/messaging/client/FlexClientBindingEvent.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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 flex.messaging.client;
-
-/**
- * Event used to notify FlexClientAttributeListeners of changes to FlexClient
- * attributes.
- */
-public class FlexClientBindingEvent
-{
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Constructs an event for an attribute that is bound or unbound from a
FlexClient.
- *
- * @param client The FlexClient.
- * @param name The attribute name.
- */
-public FlexClientBindingEvent(FlexClient client, String name)
-{
-this.client = client;
-this.name = name;
-}
-
-
-/**
- * Constructs an event for an attribute that is added to a FlexClient or
- * replaced by a new value.
- *
- * @param client The FlexClient.
- * @param name The attribute name.
- * @param value The attribute value.
- */
-public FlexClientBindingEvent(FlexClient client, String name, Object value)
-{
-this.client = client;
-this.name = name;
-this.value = value;
-}
-
-
//--
-//
-// Variables
-//
-
//--
-
-/**
- * The FlexClient that generated the event.
- */
-private FlexClient client;
-
-/**
- * The name of the attribute associated with the event.
- */
-private String name;
-
-/**
- * The value of the attribute associated with the event.
- */
-private Object value;
-
-
//--
-//
-// Methods
-//
-
//--
-
-/**
- * Returns the FlexClient that generated the event.
- *
- * @return The FlexClient that generated the event.
- */
-public FlexClient getClient()
-{
-return client;
-}
-
-/**
- * Returns the name of the attribute associated with the event.
- *
- * @return The name of the attribute associated with the event.
- */
-public String getName()
-{
-return name;
-}
-
-/**
- * Returns the value of the attribute associated with the event.
- *
- * @return The value of the attribute associated with the event.
- */
-public Object getValue()
-{
-return value;
-}
-}
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/client/FlexClientBindingListener.java
--
diff --git a/core/src/flex/messaging/client/FlexClientBindingListener.java
b/core/src/flex/messaging/client/FlexClientBindingListener.java
deleted file mode 100644
index 50c319f..000
--- a/core/src/flex/messaging/client/FlexClientBindingListener.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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
[38/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/management/runtime/messaging/MessageDestinationControlMBean.java
--
diff --git
a/core/src/flex/management/runtime/messaging/MessageDestinationControlMBean.java
b/core/src/flex/management/runtime/messaging/MessageDestinationControlMBean.java
deleted file mode 100644
index cbe4492..000
---
a/core/src/flex/management/runtime/messaging/MessageDestinationControlMBean.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * 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 flex.management.runtime.messaging;
-
-import java.io.IOException;
-import java.util.Date;
-
-import javax.management.ObjectName;
-
-
-/**
- * Defines the runtime monitoring and management interface for managed
- * MessageDestinations.
- */
-public interface MessageDestinationControlMBean extends DestinationControlMBean
-{
-/**
- * Returns the ObjectName for the message cache used by the
managed
- * destination.
- *
- * @return The ObjectName for the message cache.
- * @throws IOException Throws IOException.
- */
-ObjectName getMessageCache() throws IOException;
-
-/**
- * Returns the ObjectName for the throttle manager used by the
- * managed destination.
- *
- * @return The ObjectName for the throttle manager.
- * @throws IOException Throws IOException.
- */
-ObjectName getThrottleManager() throws IOException;
-
-/**
- * Returns the ObjectName for the subscription manager used
- * by the managed destination.
- *
- * @return The ObjectName for the subscription manager.
- * @throws IOException Throws IOException.
- */
-ObjectName getSubscriptionManager() throws IOException;
-
-/**
- * Returns the number of service message invocations.
- *
- * @return The number of service message invocations.
- * @throws IOException Throws IOException.
- */
-Integer getServiceMessageCount() throws IOException;
-
-/**
- * Resets the count of service message invocations.
- *
- * @throws IOException Throws IOException.
- */
-void resetServiceMessageCount() throws IOException;
-
-/**
- * Returns the timestamp for the most recent service message
- * invocation.
- *
- * @return The timestamp for the most recent service message invocation.
- * @throws IOException Throws IOException.
- */
-Date getLastServiceMessageTimestamp() throws IOException;
-
-/**
- * Returns the number of service message invocations per minute.
- *
- * @return The number of service message invocations per minute.
- * @throws IOException Throws IOException.
- */
-Double getServiceMessageFrequency() throws IOException;
-
-/**
- * Returns the number of service command invocations.
- *
- * @return The number of service command invocations.
- * @throws IOException Throws IOException.
- */
-Integer getServiceCommandCount() throws IOException;
-
-/**
- * Resets the count of service command invocations.
- *
- * @throws IOException Throws IOException.
- */
-void resetServiceCommandCount() throws IOException;
-
-/**
- * Returns the timestamp for the most recent service command invocation.
- *
- * @return The timestamp for the most recent service command invocation.
- * @throws IOException Throws IOException.
- */
-Date getLastServiceCommandTimestamp() throws IOException;
-
-/**
- * Returns the number of service command invocations per minute.
- *
- * @return The number of service command invocations per minute.
- * @throws IOException Throws IOException.
- */
-Double getServiceCommandFrequency() throws IOException;
-
-/**
- * Returns the number of messages from an adapter that the managed service
- * has processed.
- *
- * @return The number of messages from an adapter that the managed service
- * has processed
- * @throws IOException Throws IOException.
- */
-Integer getServiceMessageFromAdapterCount() throws IOException;
-
-/**
- * Resets the count of se
[06/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/util/RedeployManager.java
--
diff --git a/core/src/flex/messaging/util/RedeployManager.java
b/core/src/flex/messaging/util/RedeployManager.java
deleted file mode 100644
index b14c812..000
--- a/core/src/flex/messaging/util/RedeployManager.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * 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 flex.messaging.util;
-
-import flex.messaging.FlexComponent;
-import flex.messaging.config.ConfigMap;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-/**
- * This class watches for changes on files and forces a re-deploy by touching
the specified files.
- *
- *
- */
-public class RedeployManager implements FlexComponent
-{
-private boolean enabled;
-private long watchInterval;
-private List watches;
-private List touches;
-
-private ScheduledExecutorService redeployService;
-private boolean started;
-
-
//--
-//
-// Constructor
-//
-
//--
-
-/**
- * Constructs a new RedeployManager with default settings.
- */
-public RedeployManager()
-{
-this(null);
-}
-
-/**
- * Constructs a new RedeployManager with the supplied thread
- * factory.
- *
- * @param tf Thread factory to use for the scheduled service used.
- */
-public RedeployManager(ThreadFactory tf)
-{
-if (tf == null)
-tf = new MonitorThreadFactory();
-
-enabled = false;
-touches = new ArrayList();
-watchInterval = 20;
-watches = new ArrayList();
-
-redeployService = Executors.newSingleThreadScheduledExecutor(tf);
-}
-
-
//--
-//
-// Initialize, validate, start, and stop methods.
-//
-
//--
-
-/**
- * Implements FlexComponents.initialize.
- * This is no-op for RedeployManager as it does not have an id and all
- * its properties are directly settable.
- */
-public void initialize(String id, ConfigMap properties)
-{
-// No-op
-}
-
-/**
- * Implements FlexComponent.start.
- * Starts the RedeployManager.
- */
-public void start()
-{
-if (!started && enabled)
-{
-redeployService.schedule(new RedeployTask(), 20 * 1000,
TimeUnit.MILLISECONDS);
-started = true;
-}
-}
-
-/**
- * Stops the RedeployManager.
- */
-public void stop()
-{
-if (started && enabled)
-{
-started = false;
-}
-redeployService.shutdownNow();
-}
-
-
//--
-//
-// Public Methods
-//
-
//--
-
-/**
- * Returns whether redeploy is enabled or not.
- *
- * @return true if redeploy is enabled; otherwise
false.
- */
-public boolean isEnabled()
-{
-return enabled;
-}
-
-/**
- * Sets whether redeploy is enabled or not.
- *
- * @param enabled Whether redeploy is enabled or not.
- */
-public void setEnabled(boolean enabled)
-{
-this.enabled = enabled;
-}
-
-/**
- * Implements FlexComponent.isStarted.
- * Returns whether the RedeployManager is started or not.
- *
- * @return true if the component is started; otherwise
false.
- */
-public boolean isStarted()
-{
-return started;
-}
-
-/**
- * Returns th
[14/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amfx/AmfxOutput.java
--
diff --git a/core/src/flex/messaging/io/amfx/AmfxOutput.java
b/core/src/flex/messaging/io/amfx/AmfxOutput.java
deleted file mode 100644
index b416e51..000
--- a/core/src/flex/messaging/io/amfx/AmfxOutput.java
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*
- * 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 flex.messaging.io.amfx;
-
-import flex.messaging.MessageException;
-
-import flex.messaging.io.amf.ASObject;
-import flex.messaging.io.amf.AbstractAmfOutput;
-import flex.messaging.io.amf.Amf3Types;
-import flex.messaging.io.PagedRowSet;
-import flex.messaging.io.PropertyProxy;
-import flex.messaging.io.PropertyProxyRegistry;
-import flex.messaging.io.SerializationContext;
-import flex.messaging.io.SerializationDescriptor;
-import flex.messaging.io.StatusInfoProxy;
-import flex.messaging.io.amf.TraitsInfo;
-import flex.messaging.io.amf.Amf3Output;
-import flex.messaging.io.ArrayCollection;
-import flex.messaging.io.BeanProxy;
-import flex.messaging.util.Hex;
-import flex.messaging.util.Trace;
-
-import org.w3c.dom.Document;
-
-import java.io.IOException;
-import java.io.Externalizable;
-import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Array;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.sql.RowSet;
-
-/**
- * Serializes Java types to ActionScript 3 types via AMFX, an XML
- * based representation of AMF 3.
- *
- * XML is formatted using using UTF-8 encoding.
- *
- *
- * @see AmfxMessageSerializer
- * @see AmfxInput
- */
-public class AmfxOutput extends AbstractAmfOutput implements AmfxTypes
-{
-/**
- * A mapping of object instances to their serialization numbers
- * for storing object references on the stream.
- */
-protected IdentityHashMap objectTable;
-protected HashMap traitsTable;
-protected HashMap stringTable;
-
-public AmfxOutput(SerializationContext context)
-{
-super(context);
-
-objectTable = new IdentityHashMap(64);
-traitsTable = new HashMap(10);
-stringTable = new HashMap(64);
-}
-
-public void reset()
-{
-super.reset();
-objectTable.clear();
-traitsTable.clear();
-stringTable.clear();
-}
-
-/**
- * Creates a new Amf3Output instance which is initialized with the
- * current SerializationContext, OutputStream and debug trace settings
- * to switch the version of the AMF protocol mid-stream.
- */
-protected Amf3Output createAMF3Output()
-{
-return new Amf3Output(context);
-}
-
-//
-// java.io.ObjectOutput IMPLEMENTATIONS
-//
-
-public void writeObject(Object o) throws IOException
-{
-if (o == null)
-{
-writeAMFNull();
-return;
-}
-
-if (!context.legacyExternalizable && o instanceof Externalizable)
-{
-writeCustomObject(o);
-}
-else if (o instanceof String || o instanceof Character)
-{
-String s = o.toString();
-writeString(s);
-}
-else if (o instanceof Number)
-{
-if (o instanceof Integer || o instanceof Short || o instanceof
Byte)
-{
-int i = ((Number)o).intValue();
-writeAMFInt(i);
-}
-else if (!context.legacyBigNumbers &&
-(o instanceof BigInteger || o instanceof BigDecimal))
-{
-// Using double to write big numbers such as BigInteger or
-// BigDecimal can result in information loss so we write
-// them as String by default...
-writeString(o.toString());
-}
-else
-{
-double d = ((Number)o).doubleV
[10/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/services/messaging/RemoteSubscriptionManager.java
--
diff --git
a/core/src/flex/messaging/services/messaging/RemoteSubscriptionManager.java
b/core/src/flex/messaging/services/messaging/RemoteSubscriptionManager.java
deleted file mode 100644
index c1a3096..000
--- a/core/src/flex/messaging/services/messaging/RemoteSubscriptionManager.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * 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 flex.messaging.services.messaging;
-
-import flex.messaging.MessageDestination;
-import flex.messaging.MessageClient;
-import flex.messaging.services.MessageService;
-import flex.messaging.log.Log;
-import flex.messaging.util.StringUtils;
-import flex.messaging.cluster.RemoveNodeListener;
-
-import java.util.List;
-
-/**
- * The RemoteSubscriptionManager monitors subscriptions from other
- * servers, not other clients. One MessageClient instance is used for
- * each remote server. It clientId is the address of the remote server.
- * Using a separate instance of this class keeps the subscriptions
- * of local clients separate from remote clients.
- *
- *
- */
-public class RemoteSubscriptionManager extends SubscriptionManager implements
RemoveNodeListener
-{
-private Object syncLock = new Object();
-
-/*
- * A monitor lock used for synchronizing the attempt to request
subscriptions
- * across the cluster during startup.
- */
-private static final Object initRemoteSubscriptionsLock = new Object();
-
-public RemoteSubscriptionManager(MessageDestination destination)
-{
-this(destination, false);
-}
-
-public RemoteSubscriptionManager(MessageDestination destination, boolean
enableManagement)
-{
-super(destination, enableManagement);
-}
-
-public void setSessionTimeout(long sessionConfigValue)
-{
-}
-
-public long getSessionTimeout()
-{
-return 0; // not used for remote subscriptions
-}
-
-public void addSubscriber(String flexClientId, Object clientId, String
selector, String subtopic)
-{
-synchronized (syncLock)
-{
-/*
- * Only process subscriptions for servers whose subscription state
we have received
- * We may receive a subscribe/unsubscribe from a peer before we
get their
- * subscription state... we ignore these since they will be
included in the
- * state we receive later
- */
-if (allSubscriptions.get(clientId) != null)
-super.addSubscriber(clientId, selector, subtopic, null);
-else if (Log.isDebug())
-Log.getLogger(MessageService.LOG_CATEGORY).debug("Ignoring new
remote subscription for server: " + clientId + " whose subscription state we
have not yet received. selector: " + selector + " subtopic: " + subtopic);
-}
-}
-
-public void removeSubscriber(String flexClientId, Object clientId, String
selector, String subtopic, String endpoint)
-{
-synchronized (syncLock)
-{
-/* Only process subscriptions for servers whose subscription state
we have received */
-if (allSubscriptions.get(clientId) != null)
-super.removeSubscriber(clientId, selector, subtopic, null);
-}
-}
-
-protected void sendSubscriptionToPeer(boolean subscribe, String selector,
String subtopic)
-{
-// Don't do this for remote subscriptions
-}
-
-protected MessageClient newMessageClient(Object clientId, String
endpointId)
-{
-return new RemoteMessageClient(clientId, destination, endpointId);
-}
-
-/**
- * Takes the selector and subtopic list from this address and
- * for each one create a RemoteSubscription which gets
- * registered in this table. We also register the remote
- * subscription with a "per server" index so we can easily
- * remove them later on.
- * @param state the subscription state object
- * @param address the remote cluster node address
- */
-public void setSubscr
[21/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/BeanProxy.java
--
diff --git a/core/src/flex/messaging/io/BeanProxy.java
b/core/src/flex/messaging/io/BeanProxy.java
deleted file mode 100644
index 05ccb01..000
--- a/core/src/flex/messaging/io/BeanProxy.java
+++ /dev/null
@@ -1,936 +0,0 @@
-/*
- * 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 flex.messaging.io;
-
-import flex.messaging.MessageException;
-import flex.messaging.io.amf.ASObject;
-import flex.messaging.log.Log;
-import flex.messaging.log.Logger;
-import flex.messaging.util.ClassUtil;
-import flex.messaging.util.ExceptionUtil;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.AbstractCollection;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-/**
- * Uses Bean introspection to collect the properties for a given instance.
- */
-public class BeanProxy extends AbstractProxy
-{
-static final long serialVersionUID = 7365078101695257715L;
-
-private static final int FAILED_PROPERTY_READ_ERROR = 10021;
-private static final int FAILED_PROPERTY_WRITE_ERROR = 10022;
-private static final int NON_READABLE_PROPERTY_ERROR = 10023;
-private static final int NON_WRITABLE_PROPERTY_ERROR = 10024;
-private static final int UNKNOWN_PROPERTY_ERROR = 10025;
-
-protected static final Map> rwPropertyNamesCache = new
IdentityHashMap>();
-protected static final Map>
rwBeanPropertyCache = new IdentityHashMap>();
-protected static final Map
rwPropertyDescriptorCache = new IdentityHashMap();
-
-protected static final Map> roPropertyNamesCache = new
IdentityHashMap>();
-protected static final Map>
roBeanPropertyCache = new IdentityHashMap>();
-protected static final Map
roPropertyDescriptorCache = new IdentityHashMap();
-
-protected boolean cacheProperties = true;
-protected boolean cachePropertiesDescriptors = true;
-protected Class stopClass = Object.class;
-
-protected static final Map ignoreProperties = new HashMap();
-static
-{
-initializeIgnoreProperties();
-}
-
-private static void initializeIgnoreProperties()
-{
-addIgnoreProperty(AbstractMap.class, "empty");
-addIgnoreProperty(AbstractCollection.class, "empty");
-addIgnoreProperty(ASObject.class, "type");
-addIgnoreProperty(Throwable.class, "stackTrace");
-addIgnoreProperty(File.class, "parentFile");
-addIgnoreProperty(File.class, "canonicalFile");
-addIgnoreProperty(File.class, "absoluteFile");
-}
-
-/**
- * Constructor.
- */
-public BeanProxy()
-{
-this(null);
-}
-
-/**
- * Construct a new BeanProxy with the provided default instance.
- *
- * @param defaultInstance defines the alias if provided
- */
-public BeanProxy(Object defaultInstance)
-{
-super(defaultInstance);
-
-// Override default behavior here... standard Map implementations
-// are treated as anonymous Objects, i.e. without an alias.
-if (defaultInstance != null)
-alias = getClassName(defaultInstance);
-}
-
-/** {@inheritDoc} */
-public String getAlias(Object instance)
-{
-return getClassName(instance);
-}
-
-/** {@inheritDoc} */
-public List getPropertyNames(Object instance)
-{
-if (instance == null)
-return null;
-
-Class c = instance.getClass();
-List propertyNames = null;
-
-// Look up property names in cache if we don't have a custom
serialization descriptor
-if (descriptor == null)
-{
-if (getIncludeReadOnly())
-
[16/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amf/translator/ASTranslator.java
--
diff --git a/core/src/flex/messaging/io/amf/translator/ASTranslator.java
b/core/src/flex/messaging/io/amf/translator/ASTranslator.java
deleted file mode 100644
index b193a7c..000
--- a/core/src/flex/messaging/io/amf/translator/ASTranslator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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 flex.messaging.io.amf.translator;
-
-import flex.messaging.io.SerializationContext;
-import flex.messaging.io.TypeMarshaller;
-import flex.messaging.io.amf.translator.decoder.ActionScriptDecoder;
-import flex.messaging.io.amf.translator.decoder.DecoderFactory;
-import flex.messaging.util.ClassUtil;
-import flex.messaging.util.Trace;
-
-/**
- * ASTranslator provides the ability to convert between ASObjects used by
- * Flex and Java objects in your application.
- */
-public class ASTranslator implements TypeMarshaller
-{
-/** {@inheritDoc} */
-public Object createInstance(Object source, Class desiredClass)
-{
-ActionScriptDecoder decoder =
DecoderFactory.getDecoderForShell(desiredClass);
-
-Object instance = null;
-if (decoder.hasShell())
-{
-instance = decoder.createShell(source, desiredClass);
-}
-else
-{
-instance = ClassUtil.createDefaultInstance(desiredClass, null);
-}
-
-return instance;
-}
-
-/**
- * Translate an object to another object of type class.
- * obj types should be ASObject, Boolean, String, Double, Date, ArrayList
- */
-public Object convert(Object source, Class desiredClass)
-{
-if (source == null && !desiredClass.isPrimitive())
-{
-return null;
-}
-
-SerializationContext serializationContext =
SerializationContext.getSerializationContext();
-
-ActionScriptDecoder decoder;
-if (serializationContext.restoreReferences)
-decoder = DecoderFactory.getReferenceAwareDecoder(source,
desiredClass);
-else
-decoder = DecoderFactory.getDecoder(source, desiredClass);
-
-if (Trace.remote)
-{
-Trace.trace("Decoder for " + (source == null ? "null" :
source.getClass().toString()) +
-" with desired " + desiredClass + " is " +
decoder.getClass());
-}
-
-Object result = decoder.decodeObject(source, desiredClass);
-return result;
-}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/io/amf/translator/TranslationException.java
--
diff --git
a/core/src/flex/messaging/io/amf/translator/TranslationException.java
b/core/src/flex/messaging/io/amf/translator/TranslationException.java
deleted file mode 100644
index e4e41ed..000
--- a/core/src/flex/messaging/io/amf/translator/TranslationException.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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 flex.messaging.io.amf.translator;
-
-import flex.messaging.MessageException;
-
-/**
- *
- */
-public class TranslationException extends MessageException
-{
-static final long serialVersionUID = 3312487017261810877L;
-
-public TranslationException(
[26/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/core/src/flex/messaging/config/ServletResourceResolver.java
--
diff --git a/core/src/flex/messaging/config/ServletResourceResolver.java
b/core/src/flex/messaging/config/ServletResourceResolver.java
deleted file mode 100644
index b79bc27..000
--- a/core/src/flex/messaging/config/ServletResourceResolver.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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 flex.messaging.config;
-
-import flex.messaging.io.ArrayList;
-
-import javax.servlet.ServletContext;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Stack;
-
-/**
- *
- */
-public class ServletResourceResolver implements ConfigurationFileResolver
-{
-private ServletContext context;
-private Stack configurationPathStack = new Stack();
-
-/**
- * Constructor.
- *
- * @param context servlet context
- */
-public ServletResourceResolver(ServletContext context)
-{
-this.context = context;
-}
-
-/**
- * Is the configuration file available.
- *
- * @param path path to check
- * @param throwError true if wmethod shold throw a ConfigurationException
if path no found.
- * @return true if path is available
- * @throws ConfigurationException if throwError is true and path is not
available
- */
-public boolean isAvailable(String path, boolean throwError) throws
ConfigurationException
-{
-boolean available = false;
-InputStream is = context.getResourceAsStream(path);
-if (is != null)
-{
-try { is.close(); } catch (IOException ignore) { /* ignore */}
-pushConfigurationFile(path);
-available = true;
-}
-else
-{
-if (throwError)
-{
-// Please specify a valid ''services.configuration.file'' in
web.xml.
-ConfigurationException e = new ConfigurationException();
-e.setMessage(11108, new Object[] {path});
-throw e;
-}
-}
-
-return available;
-}
-
-public InputStream getConfigurationFile(String path)
-{
-InputStream is = context.getResourceAsStream(path);
-if (is != null)
-{
-pushConfigurationFile(path);
-return is;
-}
-else
-{
-// Please specify a valid ''services.configuration.file'' in
web.xml.
-ConfigurationException e = new ConfigurationException();
-e.setMessage(11108, new Object[] {path});
-throw e;
-}
-}
-
-public InputStream getIncludedFile(String src)
-{
-String path = configurationPathStack.peek() + "/" + src;
-InputStream is = context.getResourceAsStream(path);
-
-if (is != null)
-{
-pushConfigurationFile(path);
-return is;
-}
-else
-{
-// Please specify a valid include file. ''{0}'' is invalid.
-ConfigurationException e = new ConfigurationException();
-e.setMessage(11107, new Object[] {path});
-throw e;
-}
-}
-
-public void popIncludedFile()
-{
-configurationPathStack.pop();
-}
-
-/**
- * Returns the list of XML files (denoted by .xml extension) in the
directory
- * relative to the current configuration file.
- */
-public List getFiles(String dir)
-{
-List result = new ArrayList();
-String prefix = configurationPathStack.peek() + "/";
-Set paths = context.getResourcePaths(prefix + dir);
-if (paths != null)
-{
-for (Object entry : paths)
-{
-String path = (String) entry;
-if (path.endsWith(".xml"))
-{
-result.add(path.substring(prefix.length()));
-}
-}
-return result;
-}
-else
-{
-
[44/51] [partial] flex-blazeds git commit: - Major code scrub
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/8315f8fa/common/src/main/java/flex/messaging/config/ClientConfigurationParser.java
--
diff --git
a/common/src/main/java/flex/messaging/config/ClientConfigurationParser.java
b/common/src/main/java/flex/messaging/config/ClientConfigurationParser.java
new file mode 100644
index 000..cff5d47
--- /dev/null
+++ b/common/src/main/java/flex/messaging/config/ClientConfigurationParser.java
@@ -0,0 +1,951 @@
+/*
+ * 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 flex.messaging.config;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * A special mxmlc compiler specific implentation of the configuration
+ * parser for JDK 1.4. Only a small subset of the configuration is
+ * processed to generate the information that the client needs at runtime,
+ * such as channel definitions and service destination properties.
+ *
+ *
+ */
+public abstract class ClientConfigurationParser extends
AbstractConfigurationParser
+{
+protected void parseTopLevelConfig(Document doc)
+{
+Node root = selectSingleNode(doc, "/" + SERVICES_CONFIG_ELEMENT);
+
+if (root != null)
+{
+// Validation
+allowedChildElements(root, SERVICES_CONFIG_CHILDREN);
+
+// Channels (parse before services)
+channelsSection(root);
+
+// Services
+services(root);
+
+// Clustering
+clusters(root);
+
+// FlexClient
+flexClient(root);
+}
+}
+
+private void channelsSection(Node root)
+{
+Node channelsNode = selectSingleNode(root, CHANNELS_ELEMENT);
+if (channelsNode != null)
+{
+// Validation
+allowedAttributesOrElements(channelsNode, CHANNELS_CHILDREN);
+
+NodeList channels = selectNodeList(channelsNode,
CHANNEL_DEFINITION_ELEMENT);
+for (int i = 0; i < channels.getLength(); i++)
+{
+Node channel = channels.item(i);
+channelDefinition(channel);
+}
+NodeList includes = selectNodeList(channelsNode,
CHANNEL_INCLUDE_ELEMENT);
+for (int i = 0; i < includes.getLength(); i++)
+{
+Node include = includes.item(i);
+channelInclude(include);
+}
+}
+}
+
+private void channelDefinition(Node channel)
+{
+// Validation
+requiredAttributesOrElements(channel, CHANNEL_DEFINITION_REQ_CHILDREN);
+allowedAttributesOrElements(channel, CHANNEL_DEFINITION_CHILDREN);
+
+String id = getAttributeOrChildElement(channel, ID_ATTR).trim();
+if (isValidID(id))
+{
+// Don't allow multiple channels with the same id
+if (config.getChannelSettings(id) != null)
+{
+// Cannot have multiple channels with the same id ''{0}''.
+ConfigurationException e = new ConfigurationException();
+e.setMessage(DUPLICATE_CHANNEL_ERROR, new Object[]{id});
+throw e;
+}
+
+ChannelSettings channelSettings = new ChannelSettings(id);
+
+// Endpoint
+Node endpoint = selectSingleNode(channel, ENDPOINT_ELEMENT);
+if (endpoint != null)
+{
+// Endpoint Validation
+allowedAttributesOrElements(endpoint, ENDPOINT_CHILDREN);
+
+// The url attribute may also be specified by the deprecated
uri attribute
+String uri = getAttributeOrChildElement(endpoint, URL_ATTR);
+if (uri == null || EMPTY_STRING.equals(uri))
+uri = getAttributeOrChildElement(endpoint, URI_ATTR);
+channelSettings.setUri(uri);
+
+config.addChannelSettings(id, channelSettings);
+}
+
+channelServerOnlyAttribute(channel, channelSettings);
+
+
git commit: [flex-asjs] [refs/heads/develop] - - Added a missing "scope=runtime" to the extern dependencies.
Repository: flex-asjs
Updated Branches:
refs/heads/develop a87352f3a -> 8cd193673
- Added a missing "scope=runtime" to the extern dependencies.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8cd19367
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8cd19367
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8cd19367
Branch: refs/heads/develop
Commit: 8cd193673224d0918c1ffcd81e8113ab4be262ed
Parents: a87352f
Author: Christofer Dutz
Authored: Wed Feb 15 20:22:54 2017 +0100
Committer: Christofer Dutz
Committed: Wed Feb 15 20:22:54 2017 +0100
--
examples/native/ButtonExample/pom.xml | 18 +-
1 file changed, 1 insertion(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8cd19367/examples/native/ButtonExample/pom.xml
--
diff --git a/examples/native/ButtonExample/pom.xml
b/examples/native/ButtonExample/pom.xml
index 5dbbece..fa34cf9 100644
--- a/examples/native/ButtonExample/pom.xml
+++ b/examples/native/ButtonExample/pom.xml
@@ -57,29 +57,13 @@
-
-
-
-
org.apache.flex.flexjs.typedefs
flexjs-typedefs-gcl
${flexjs.typedefs.version}
swc
typedefs
+ runtime
git commit: [flex-falcon] [refs/heads/develop] - - Fixed a problem not supporting DEFINE::JS expressions when compiling Applications to JS
Repository: flex-falcon
Updated Branches:
refs/heads/develop 883bebd8d -> a39055866
- Fixed a problem not supporting DEFINE::JS expressions when compiling
Applications to JS
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a3905586
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a3905586
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a3905586
Branch: refs/heads/develop
Commit: a39055866a4eb0473e2d74eba1449b1de000ded3
Parents: 883bebd
Author: Christofer Dutz
Authored: Wed Feb 15 19:48:53 2017 +0100
Committer: Christofer Dutz
Committed: Wed Feb 15 19:48:53 2017 +0100
--
.../main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a3905586/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
--
diff --git
a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
index c7e9dbe..258f6cc 100644
---
a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
+++
b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
@@ -177,8 +177,8 @@ public class CompileAppMojo
@Override
protected List getDefines() throws MojoExecutionException {
List defines = super.getDefines();
-defines.add(new Define("COMPILE::JS", "false"));
-defines.add(new Define("COMPILE::SWF", "true"));
+defines.add(new Define("COMPILE::JS", outputJavaScript ? "true" :
"false"));
+defines.add(new Define("COMPILE::SWF", outputJavaScript ? "false" :
"true"));
return defines;
}
[2/3] git commit: [flex-asjs] [refs/heads/develop] - - Made 2 of the 3 examples in "native" build with maven (could require adjustment of the Ant build because of refactoring of the directory structur
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de0cca78/examples/native/USStatesMap/src/MapCoords.as
--
diff --git a/examples/native/USStatesMap/src/MapCoords.as
b/examples/native/USStatesMap/src/MapCoords.as
deleted file mode 100644
index 4cf953d..000
--- a/examples/native/USStatesMap/src/MapCoords.as
+++ /dev/null
@@ -1,75 +0,0 @@
-
-//
-// 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
-{
- public class MapCoords
- {
- public var usmap:Object = {
-
hi:"M298.189,269.828l0.072-0.288l0.72-0.721l0.216-0.359l0.072-0.72l-0.721,0.575l-0.72,0.721L298.189,269.828zM304.525,269.036l0.072-0.145l0.792-0.647l0.144-0.792l0.288-0.72v-0.217l-0.72-0.792h-0.721l-0.719-0.071l-0.721,0.432l-0.792,0.432l-0.072,0.145l-0.432,0.72l0.647,0.72l0.721,0.36l0.72,0.359L304.525,269.036zM318.35,274.58l0.72-0.216l0.72-0.216l-0.504-0.721l-0.144-0.72l-0.792,0.071l-0.216-0.719l-0.504-0.721l-0.504-0.72l-0.792,0.288l-0.721,0.648h-0.72l-0.144,0.359l0.144,0.792l0.72,0.72l0.648,0.721l0.72-0.072l-0.072-0.504l0.721,0.288L318.35,274.58zM326.414,276.524l0.216-0.072l0.792-0.36l-0.072-0.72l-0.504,0.072h-0.72l-0.721-0.145l-0.792-0.144l-0.72-0.072l-0.721-0.072v0.288l-0.503,0.72h0.72h0.72l0.792-0.071l0.721,0.359L326.414,276.524zM326.054,279.332l0.144-0.072l0.721-0.72l-0.648-0.721l-0.721-0.216l-0.791,0.216l0.647,0.721L326.054,279.332zM330.589,280.699l0.505-0.071l0.792-0.359h0.72l0.433-0.217l0.72-0.72l-0.36-0.721l-0.72-0.359l-0.721-0.504l-0.144-0.216l-0.792-0.145l-0.72,0.288l-
0.721-0.144l-0.504-0.721l-0.792-0.144l-0.288,0.36l-0.144,0.72l0.504,0.72l0.72,0.36l0.72,0.359h0.072l0.072,0.792L330.589,280.699zM336.71,295.172l0.72,0.216l0.576-0.72l0.287-0.72l0.792-0.433l0.433-0.432l0.792-0.576l0.721,0.072l0.792-0.216l0.792-0.289l0.72-0.647l0.216-0.216l0.72-0.504l-0.072-0.721l-0.72-0.432l-0.504-0.792l-0.433-0.432l-0.432-0.721l-0.287-0.72l-0.648-0.72l-0.721-0.36l-0.72-0.359l-0.72-0.36l-0.792-0.288l-0.721-0.144l-0.72-0.432l-0.792-0.576l-0.359-0.145l-0.433,0.721l0.145,0.72l0.576,0.792l-0.504,0.72l-0.433,0.72l-0.072,0.072l-0.72,0.504l-0.288,0.721l0.504,0.719l0.288,0.721l0.288,0.792v0.216l0.288,0.721l-0.072,0.792l-0.071,0.72l-0.072,0.72l0.36,0.72l0.72,0.216l0.432,0.288L336.71,295.172z",
-
ak:"M553.678,107.837l0.287-0.216l0.721-0.72l0.504-0.792l0.36-0.72l0.647-2.232l0.792-1.512l0.288-0.792l0.433-2.736v-2.232l-0.433-3.024l-1.008-2.304l0.432-0.72l-0.72,0.288l-2.088-3.96l-0.144-0.72l0.288-0.72l0.503-0.792l-0.576-2.232l-0.431-0.72l0.071-0.72l0.648-0.792l0.864-2.232l0.071-0.792l-0.145-0.72l0.145-1.296l-0.432-1.44l0.72-0.576l0.648-0.72l-0.072-0.72l0.936-1.368l0.721,0.216l0.575-0.72l0.145-0.72l0.504-0.72l0.288-0.72l0.72-0.576l-0.216,2.088l-0.216,0.504l0.359,0.792l-0.288,0.72l0.145,0.72l0.504-0.72l0.217-1.512l0.287-0.072v1.512l-0.216,0.72l0.648-0.72l0.216-0.792l0.144-0.72v-0.864l-0.359-2.304l0.504-0.72l0.72-0.576l0.792-0.432h1.008l-0.071-0.648l-0.721-0.432l-0.359-0.792v-0.72l0.72-0.864l0.432-0.792l0.72-0.36l0.648-0.576l0.792,0.432l0.721,0.216l0.719,0.576h0.721l0.648-0.144l0.719,0.216l0.721,0.432l0.433,0.72l0.72,0.216h0.791l0.721,0.36l1.584,0.432l0.792,0.36h0.72l0.793,0.504l0.215,0.72l0.577,0.72l0.431,0.288v0.72l-0.719,0.144l-0.289,0.936l0.433,0.72l0.792,0.504l0.359,0.72l0.
36,1.512l-0.071,1.512l0.288,2.376l-0.721,0.72l-0.72,0.432l-0.217,0.72l-0.071,1.512l-0.721,1.152l-0.792,0.144l-0.792,0.576l-0.144,1.512l0.072,1.152l0.936,0.864l0.793,0.072l0.719,0.288l0.577-0.792l0.359-0.72l0.721-0.576l0.359-1.296l-0.144-0.72l0.72-0.288l0.792-0.72l0.72-0.288l1.152-0.864l0.792,0.144l0.72,0.288l0.72,0.72l0.864,1.512l0.792,2.952l0.433,0.72l0.432,1.512l0.432,1.584l0.36,0.864l0.72,1.224h0.072l0.072,0.576l-0.216,0.288l-0.145,1.512l0.216,0.72l-0.144,1.584l-0.433,0.72l-0.504,0.216l0.144-0.216l-0.215-0.72l-0.36-0.504l-0.792,0.432l-0.144,0.648l-0.505,0.72l0.072,1.584l-0.576,0.72l-0.863,0.648l-0.073,0.144l-0.216,0.36l-0.215,0.72l-0.073,2.232l-1.296,2.232l-0.504,1.512l-3.527,0.72l-7.849,1.296l-0.864-0.648l-12.168,1.512l-4.247,
[1/3] git commit: [flex-asjs] [refs/heads/develop] - - Made 2 of the 3 examples in "native" build with maven (could require adjustment of the Ant build because of refactoring of the directory structur
Repository: flex-asjs
Updated Branches:
refs/heads/develop 3e284d0e2 -> de0cca788
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de0cca78/examples/native/USStatesMap/src/main/flex/MapCoords.as
--
diff --git a/examples/native/USStatesMap/src/main/flex/MapCoords.as
b/examples/native/USStatesMap/src/main/flex/MapCoords.as
new file mode 100644
index 000..4cf953d
--- /dev/null
+++ b/examples/native/USStatesMap/src/main/flex/MapCoords.as
@@ -0,0 +1,75 @@
+
+//
+// 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
+{
+ public class MapCoords
+ {
+ public var usmap:Object = {
+
hi:"M298.189,269.828l0.072-0.288l0.72-0.721l0.216-0.359l0.072-0.72l-0.721,0.575l-0.72,0.721L298.189,269.828zM304.525,269.036l0.072-0.145l0.792-0.647l0.144-0.792l0.288-0.72v-0.217l-0.72-0.792h-0.721l-0.719-0.071l-0.721,0.432l-0.792,0.432l-0.072,0.145l-0.432,0.72l0.647,0.72l0.721,0.36l0.72,0.359L304.525,269.036zM318.35,274.58l0.72-0.216l0.72-0.216l-0.504-0.721l-0.144-0.72l-0.792,0.071l-0.216-0.719l-0.504-0.721l-0.504-0.72l-0.792,0.288l-0.721,0.648h-0.72l-0.144,0.359l0.144,0.792l0.72,0.72l0.648,0.721l0.72-0.072l-0.072-0.504l0.721,0.288L318.35,274.58zM326.414,276.524l0.216-0.072l0.792-0.36l-0.072-0.72l-0.504,0.072h-0.72l-0.721-0.145l-0.792-0.144l-0.72-0.072l-0.721-0.072v0.288l-0.503,0.72h0.72h0.72l0.792-0.071l0.721,0.359L326.414,276.524zM326.054,279.332l0.144-0.072l0.721-0.72l-0.648-0.721l-0.721-0.216l-0.791,0.216l0.647,0.721L326.054,279.332zM330.589,280.699l0.505-0.071l0.792-0.359h0.72l0.433-0.217l0.72-0.72l-0.36-0.721l-0.72-0.359l-0.721-0.504l-0.144-0.216l-0.792-0.145l-0.72,0.288l-
0.721-0.144l-0.504-0.721l-0.792-0.144l-0.288,0.36l-0.144,0.72l0.504,0.72l0.72,0.36l0.72,0.359h0.072l0.072,0.792L330.589,280.699zM336.71,295.172l0.72,0.216l0.576-0.72l0.287-0.72l0.792-0.433l0.433-0.432l0.792-0.576l0.721,0.072l0.792-0.216l0.792-0.289l0.72-0.647l0.216-0.216l0.72-0.504l-0.072-0.721l-0.72-0.432l-0.504-0.792l-0.433-0.432l-0.432-0.721l-0.287-0.72l-0.648-0.72l-0.721-0.36l-0.72-0.359l-0.72-0.36l-0.792-0.288l-0.721-0.144l-0.72-0.432l-0.792-0.576l-0.359-0.145l-0.433,0.721l0.145,0.72l0.576,0.792l-0.504,0.72l-0.433,0.72l-0.072,0.072l-0.72,0.504l-0.288,0.721l0.504,0.719l0.288,0.721l0.288,0.792v0.216l0.288,0.721l-0.072,0.792l-0.071,0.72l-0.072,0.72l0.36,0.72l0.72,0.216l0.432,0.288L336.71,295.172z",
+
ak:"M553.678,107.837l0.287-0.216l0.721-0.72l0.504-0.792l0.36-0.72l0.647-2.232l0.792-1.512l0.288-0.792l0.433-2.736v-2.232l-0.433-3.024l-1.008-2.304l0.432-0.72l-0.72,0.288l-2.088-3.96l-0.144-0.72l0.288-0.72l0.503-0.792l-0.576-2.232l-0.431-0.72l0.071-0.72l0.648-0.792l0.864-2.232l0.071-0.792l-0.145-0.72l0.145-1.296l-0.432-1.44l0.72-0.576l0.648-0.72l-0.072-0.72l0.936-1.368l0.721,0.216l0.575-0.72l0.145-0.72l0.504-0.72l0.288-0.72l0.72-0.576l-0.216,2.088l-0.216,0.504l0.359,0.792l-0.288,0.72l0.145,0.72l0.504-0.72l0.217-1.512l0.287-0.072v1.512l-0.216,0.72l0.648-0.72l0.216-0.792l0.144-0.72v-0.864l-0.359-2.304l0.504-0.72l0.72-0.576l0.792-0.432h1.008l-0.071-0.648l-0.721-0.432l-0.359-0.792v-0.72l0.72-0.864l0.432-0.792l0.72-0.36l0.648-0.576l0.792,0.432l0.721,0.216l0.719,0.576h0.721l0.648-0.144l0.719,0.216l0.721,0.432l0.433,0.72l0.72,0.216h0.791l0.721,0.36l1.584,0.432l0.792,0.36h0.72l0.793,0.504l0.215,0.72l0.577,0.72l0.431,0.288v0.72l-0.719,0.144l-0.289,0.936l0.433,0.72l0.792,0.504l0.359,0.72l0.
36,1.512l-0.071,1.512l0.288,2.376l-0.721,0.72l-0.72,0.432l-0.217,0.72l-0.071,1.512l-0.721,1.152l-0.792,0.144l-0.792,0.576l-0.144,1.512l0.072,1.152l0.936,0.864l0.793,0.072l0.719,0.288l0.577-0.792l0.359-0.72l0.721-0.576l0.359-1.296l-0.144-0.72l0.72-0.288l0.792-0.72l0.72-0.288l1.152-0.864l0.792,0.144l0.72,0.288l0.72,0.72l0.864,1.512l0.792,2.952l0.433,0.72l0.432,1.512l0.432,1.584l0.36,0.864l0.72,1.224h0.072l0.072,0.576l-0.216,0.288l-0.145,1.512l0.216,0.72l-0.144,1.584l-0.433,0.72l-0.504,0.216l0.144-0.216l-0.215-0.72l-0.36-0.504l-0.792,0.432l-0.144,0.648l-0.505,0.72l0.072,1.584l-0.576,0.72l-0.863,0.648l-0.073,0.144l
[3/3] git commit: [flex-asjs] [refs/heads/develop] - - Made 2 of the 3 examples in "native" build with maven (could require adjustment of the Ant build because of refactoring of the directory structur
- Made 2 of the 3 examples in "native" build with maven (could require
adjustment of the Ant build because of refactoring of the directory structure)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/de0cca78
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/de0cca78
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/de0cca78
Branch: refs/heads/develop
Commit: de0cca788599b912976519940209ae5a66263832
Parents: 3e284d0
Author: Christofer Dutz
Authored: Wed Feb 15 13:24:17 2017 +0100
Committer: Christofer Dutz
Committed: Wed Feb 15 13:24:17 2017 +0100
--
.../native/AngularExample/src/AngularExample.as | 84 ---
.../native/AngularExample/src/MyController.as | 70 --
.../src/components/IWebComponent.as | 27
.../src/components/WebComponent.as | 38 -
.../src/components/mdbutton/MDButton.as | 61
.../src/components/mdbutton/MDButtonFactory.as | 56
.../src/main/flex/AngularExample.as | 84 +++
.../src/main/flex/MyController.as | 70 ++
.../src/main/flex/components/IWebComponent.as | 27
.../src/main/flex/components/WebComponent.as| 38 +
.../main/flex/components/mdbutton/MDButton.as | 61
.../flex/components/mdbutton/MDButtonFactory.as | 56
examples/native/ButtonExample/pom.xml | 12 +-
examples/native/USStatesMap/pom.xml | 24
examples/native/USStatesMap/src/MapCoords.as| 75 --
examples/native/USStatesMap/src/USStatesMap.as | 140 ---
.../USStatesMap/src/main/flex/MapCoords.as | 75 ++
.../USStatesMap/src/main/flex/USStatesMap.as| 140 +++
examples/native/pom.xml | 2 +-
examples/pom.xml| 2 +-
20 files changed, 580 insertions(+), 562 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de0cca78/examples/native/AngularExample/src/AngularExample.as
--
diff --git a/examples/native/AngularExample/src/AngularExample.as
b/examples/native/AngularExample/src/AngularExample.as
deleted file mode 100644
index 6bc74c9..000
--- a/examples/native/AngularExample/src/AngularExample.as
+++ /dev/null
@@ -1,84 +0,0 @@
-
-//
-// 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 {
- import angular.IModule;
-
- import components.mdbutton.MDButton;
- import components.mdbutton.MDButtonFactory;
- /**
-* @author omuppirala
-*/
- public class AngularExample {
-
- private var app:IModule;
-
- public function AngularExample() {
- //set up angular app
- app = angular.module("app",["ngMaterial"]);
- app.controller("MyController", ["$scope", "$mdDialog",
MyController]);
- document.body.setAttribute("ng-app", "app");
-
- //App container
- var container:HTMLDivElement =
document.createElement('div') as HTMLDivElement;
- container.style.width = '100%';
- container.style.height = '100%';
- container.setAttribute("layout", "row");
- container.setAttribute("layout-align", "center center");
- document.body.appendChild(container);
-
- //App
- var div:HTMLDivElement = document.createElement('div')
as HTMLDivElement;
- div.id = 'div';
- div.style.width = '50%';
- div.style.height = '50%';
git commit: [flex-utilities] [refs/heads/develop] - - Added an expanation to ssl handshake errors when downloading from sourceforge.
Repository: flex-utilities
Updated Branches:
refs/heads/develop 9b38938c0 -> 581567a91
- Added an expanation to ssl handshake errors when downloading from sourceforge.
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/581567a9
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/581567a9
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/581567a9
Branch: refs/heads/develop
Commit: 581567a911b57eb576cac297439919751cfb52c3
Parents: 9b38938
Author: Christofer Dutz
Authored: Fri Feb 10 17:19:49 2017 +0100
Committer: Christofer Dutz
Committed: Fri Feb 10 17:19:49 2017 +0100
--
.../retrievers/download/DownloadRetriever.java | 31
1 file changed, 18 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/581567a9/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
--
diff --git
a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
index f80c7f2..a29e2f4 100644
---
a/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
+++
b/flex-maven-tools/flex-sdk-converter/retrievers/download/src/main/java/org/apache/flex/utilities/converter/retrievers/download/DownloadRetriever.java
@@ -37,6 +37,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
+import javax.net.ssl.SSLHandshakeException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -85,34 +86,32 @@ public class DownloadRetriever extends BaseRetriever {
confirmLicenseAcceptance(type);
}
-if(type.equals(SdkType.FONTKIT)) {
+if (type.equals(SdkType.FONTKIT)) {
File tmpTargetFile =
File.createTempFile(UUID.randomUUID().toString(), "");
String tempSuffix =
tmpTargetFile.getName().substring(tmpTargetFile.getName().lastIndexOf("-"));
-if(!(tmpTargetFile.delete()))
-{
+if (!(tmpTargetFile.delete())) {
throw new IOException("Could not delete temp file: " +
tmpTargetFile.getAbsolutePath());
}
File targetRootDir = new File(tmpTargetFile.getParentFile(),
type.toString() + tempSuffix);
File targetDir = new File(targetRootDir,
"/lib/external/optional");
-if(!(targetDir.mkdirs()))
-{
+if (!(targetDir.mkdirs())) {
throw new IOException("Could not create temp directory: "
+ targetDir.getAbsolutePath());
}
-final URI afeUri = new
URI("http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/afe.jar?format=raw";);
+final URI afeUri = new
URI("https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/afe.jar?format=raw";);
final File afeFile = new File(targetDir, "afe.jar");
performSafeDownload(afeUri, afeFile);
-final URI aglj40Uri = new
URI("http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/aglj40.jar?format=raw";);
+final URI aglj40Uri = new
URI("https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/aglj40.jar?format=raw";);
final File aglj40File = new File(targetDir, "aglj40.jar");
performSafeDownload(aglj40Uri, aglj40File);
-final URI rideauUri = new
URI("http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/rideau.jar?format=raw";);
+final URI rideauUri = new
URI("https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/rideau.jar?format=raw";);
final File rideauFile = new File(targetDir, "rideau.jar");
performSafeDownload(rideauUri, rideauFile);
-final URI flexFontkitUri = new
URI("http://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/flex-fontkit.jar?format=raw";);
+final URI flexFontkitUri = new
URI("https://sourceforge.net/adobe/flexsdk/code/HEAD/tree/trunk/lib/flex-fontkit.jar?format=raw";);
final File flexFontkitFile = new File(targetDir,
"flex-fontkit.jar");
performSafeDownload(flexFo
git commit: [flex-asjs] [refs/heads/develop] - - Removed the "Basic" module from the distribution
Repository: flex-asjs
Updated Branches:
refs/heads/develop 316f9201e -> d40b9ddff
- Removed the "Basic" module from the distribution
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d40b9ddf
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d40b9ddf
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d40b9ddf
Branch: refs/heads/develop
Commit: d40b9ddff8d6032dff5f1c9e8bace3ef4f3a5b6a
Parents: 316f920
Author: Christofer Dutz
Authored: Thu Feb 9 10:10:24 2017 +0100
Committer: Christofer Dutz
Committed: Thu Feb 9 10:10:24 2017 +0100
--
.../org/example/flexjs/mylib/JavaScriptClass.as | 30
.../flexjs-simple-typedef-archetype/pom.xml | 55 ++
.../META-INF/maven/archetype-metadata.xml | 43 +++
.../main/resources/archetype-resources/pom.xml | 80
.../src/main/javascript/myscripts.js| 58 ++
archetypes/pom.xml | 1 +
6 files changed, 267 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d40b9ddf/archetypes/flexjs-simple-library-archetype/src/main/resources/archetype-resources/src/main/flex/org/example/flexjs/mylib/JavaScriptClass.as
--
diff --git
a/archetypes/flexjs-simple-library-archetype/src/main/resources/archetype-resources/src/main/flex/org/example/flexjs/mylib/JavaScriptClass.as
b/archetypes/flexjs-simple-library-archetype/src/main/resources/archetype-resources/src/main/flex/org/example/flexjs/mylib/JavaScriptClass.as
new file mode 100644
index 000..7ce4f82
--- /dev/null
+++
b/archetypes/flexjs-simple-library-archetype/src/main/resources/archetype-resources/src/main/flex/org/example/flexjs/mylib/JavaScriptClass.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.example.flexjs.mylib {
+
+public class JavaScriptClass
+{
+
+public function javaScriptMethod():void {
+// Do nothing in JavaScript
+}
+
+}
+}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d40b9ddf/archetypes/flexjs-simple-typedef-archetype/pom.xml
--
diff --git a/archetypes/flexjs-simple-typedef-archetype/pom.xml
b/archetypes/flexjs-simple-typedef-archetype/pom.xml
new file mode 100644
index 000..73f9ef6
--- /dev/null
+++ b/archetypes/flexjs-simple-typedef-archetype/pom.xml
@@ -0,0 +1,55 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ 4.0.0
+
+
+org.apache.flex.flexjs.framework
+flexjs-maven-archetypes
+0.8.0-SNAPSHOT
+
+
+ flexjs-simple-typedef-archetype
+ 0.8.0-SNAPSHOT
+ maven-archetype
+
+ Apache Flex - FlexJS: Framework: Archetypes: Simple FlexJS Typedef
Library
+ Maven archetype for creating FlexJS Maven project for building
a simple FlexJS typedef library.
+
+
+
+
+org.apache.maven.archetype
+archetype-packaging
+2.4
+
+
+
+
+
+
+ maven-archetype-plugin
+ 2.4
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d40b9ddf/archetypes/flexjs-simple-typedef-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
--
diff --git
a/archetypes/flexjs-simple-typedef-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/archetypes/flexjs-simple-typedef-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 000..2ef5b6d
--- /dev/null
+++
b/archetypes/flexjs-simple-typedef-archetype/src/main/resources/META-INF/maven/archety
git commit: [flex-asjs] [refs/heads/develop] - - Replaced the not working archetype for flexjs libraries with a new implementation
Repository: flex-asjs Updated Branches: refs/heads/develop 82b692096 -> 7829f4cb7 - Replaced the not working archetype for flexjs libraries with a new implementation Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7829f4cb Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7829f4cb Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7829f4cb Branch: refs/heads/develop Commit: 7829f4cb74fdc36663267da0f4fcb0d75d0fd984 Parents: 82b6920 Author: Christofer Dutz Authored: Wed Feb 8 17:42:37 2017 +0100 Committer: Christofer Dutz Committed: Wed Feb 8 17:42:37 2017 +0100 -- .../flexjs-simple-library-archetype/pom.xml | 31 -- .../META-INF/maven/archetype-metadata.xml | 37 .../main/resources/META-INF/maven/archetype.xml | 30 -- .../main/resources/archetype-resources/pom.xml | 60 +++- .../src/main/flex/MylibClasses.as | 44 ++ .../flex/org/example/flexjs/mylib/FlashClass.as | 30 ++ .../org/example/flexjs/mylib/UniversalClass.as | 43 ++ .../src/main/resources/mylib-manifest.xml | 27 + 8 files changed, 263 insertions(+), 39 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7829f4cb/archetypes/flexjs-simple-library-archetype/pom.xml -- diff --git a/archetypes/flexjs-simple-library-archetype/pom.xml b/archetypes/flexjs-simple-library-archetype/pom.xml index 714a8dc..173e06e 100644 --- a/archetypes/flexjs-simple-library-archetype/pom.xml +++ b/archetypes/flexjs-simple-library-archetype/pom.xml @@ -28,9 +28,28 @@ flexjs-simple-library-archetype 0.8.0-SNAPSHOT - jar - - Apache Flex - FlexJS: Framework: Archetypes: Library - Maven archetype for creating flexjs maven project for building a library - - \ No newline at end of file + maven-archetype + + Apache Flex - FlexJS: Framework: Archetypes: Simple FlexJS Library + Maven archetype for creating FlexJS Maven project for building a simple FlexJS library. + + + + +org.apache.maven.archetype +archetype-packaging +2.4 + + + + + + + maven-archetype-plugin + 2.4 + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7829f4cb/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml -- diff --git a/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml new file mode 100644 index 000..53a158b --- /dev/null +++ b/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -0,0 +1,37 @@ + + +http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; name="Core" + xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + + + src/main/resources + +**/*.xml + + + + src/main/flex + +**/*.as + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7829f4cb/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype.xml -- diff --git a/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype.xml b/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype.xml deleted file mode 100644 index 561c04e..000 --- a/archetypes/flexjs-simple-library-archetype/src/main/resources/META-INF/maven/archetype.xml +++ /dev/null @@ -1,30 +0,0 @@ - - -http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd";> - flexjs-simple-library-archetype - -src/main/java/App.java - - -src/test/java/AppTest.java - - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7829f4cb/archetypes/flexjs-simple-library-archetype/src/main/resources/archetype-resources/pom.xml -- diff --git a/archetypes/flexjs-simple-library-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-library-arch
git commit: [flex-asjs] [refs/heads/develop] - - Updated the integration-tests to tomcat 8.5.11 - Updated the tomcat download server to an apache server
Repository: flex-asjs
Updated Branches:
refs/heads/develop 71d2a0031 -> 2fc25fccd
- Updated the integration-tests to tomcat 8.5.11
- Updated the tomcat download server to an apache server
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2fc25fcc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2fc25fcc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2fc25fcc
Branch: refs/heads/develop
Commit: 2fc25fccdd9cd1c2eaed326076375f58a826ff3a
Parents: 71d2a00
Author: Christofer Dutz
Authored: Wed Feb 8 11:33:12 2017 +0100
Committer: Christofer Dutz
Committed: Wed Feb 8 11:33:12 2017 +0100
--
examples/examples-integrationtests/pom.xml | 6 +-
examples/examples-tests/pom.xml| 2 +-
frameworks/projects/pom.xml| 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2fc25fcc/examples/examples-integrationtests/pom.xml
--
diff --git a/examples/examples-integrationtests/pom.xml
b/examples/examples-integrationtests/pom.xml
index c4a62d8..99d7ce4 100644
--- a/examples/examples-integrationtests/pom.xml
+++ b/examples/examples-integrationtests/pom.xml
@@ -34,6 +34,10 @@
Apache Flex - FlexJS: Examples: Integrationtests
+
+8.5.11
+
+
integrationtests
@@ -89,7 +93,7 @@
tomcat8x
${project.build.directory}/tomcat8x/container.log
-
http://ftp.fau.de/apache/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.zip
+
http://www-us.apache.org/dist/tomcat/tomcat-8/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip
${java.io.tmpdir}/cargo/installs
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2fc25fcc/examples/examples-tests/pom.xml
--
diff --git a/examples/examples-tests/pom.xml b/examples/examples-tests/pom.xml
index 31a5e8d..86366ad 100644
--- a/examples/examples-tests/pom.xml
+++ b/examples/examples-tests/pom.xml
@@ -29,7 +29,7 @@
examples-tests
0.8.0-SNAPSHOT
- Apache Flex - FlexJS: Framework: Example-Tests
+ Apache Flex - FlexJS: Examples: Example-Tests
src/main/java
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2fc25fcc/frameworks/projects/pom.xml
--
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index f7442dc..4ee0a13 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -43,7 +43,7 @@
Express
Flat
Formatters
- FontAwesome
+FontAwesome
GoogleMaps
Graphics
Basic
git commit: [flex-utilities] [refs/heads/develop] - - Switched from System.out.println to logback - Fixed a problem in the AirConverter, not packaging all the required parts
Repository: flex-utilities
Updated Branches:
refs/heads/develop 30ef5fb36 -> 9b38938c0
- Switched from System.out.println to logback
- Fixed a problem in the AirConverter, not packaging all the required parts
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/9b38938c
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/9b38938c
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/9b38938c
Branch: refs/heads/develop
Commit: 9b38938c03d454415258226ae10e7d3aa464493e
Parents: 30ef5fb
Author: Christofer Dutz
Authored: Fri Feb 3 15:31:03 2017 +0100
Committer: Christofer Dutz
Committed: Fri Feb 3 15:31:26 2017 +0100
--
.../utilities/converter/air/AirConverter.java | 40
.../flex-sdk-converter/converters/base/pom.xml | 16
.../flex/utilities/converter/BaseConverter.java | 10 +++--
.../base/src/main/resources/logback.xml | 16
.../deployer/aether/AetherDeployer.java | 26 +++--
5 files changed, 86 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/9b38938c/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
--
diff --git
a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
index 46373c4..205daaa 100644
---
a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
+++
b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
@@ -20,6 +20,8 @@ import org.apache.flex.utilities.converter.BaseConverter;
import org.apache.flex.utilities.converter.Converter;
import org.apache.flex.utilities.converter.exceptions.ConverterException;
import org.apache.flex.utilities.converter.model.MavenArtifact;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.*;
import java.util.*;
@@ -31,6 +33,8 @@ import java.util.zip.ZipOutputStream;
*/
public class AirConverter extends BaseConverter implements Converter {
+private static final Logger LOG =
LoggerFactory.getLogger(AirConverter.class);
+
private String airSdkVersion;
/**
@@ -53,7 +57,7 @@ public class AirConverter extends BaseConverter implements
Converter {
@Override
protected void processDirectory() throws ConverterException {
if ((airSdkVersion == null) || !rootSourceDirectory.exists() ||
!rootSourceDirectory.isDirectory()) {
-System.out.println("Skipping AIR SDK generation.");
+LOG.info("Skipping AIR SDK generation.");
return;
}
@@ -94,13 +98,28 @@ public class AirConverter extends BaseConverter implements
Converter {
compiler.addDependency(artifact);
}
+// Generate the common package (files from the bin directory)
+File binDir = new File(rootSourceDirectory, "bin");
+if (binDir.exists() && binDir.isDirectory()) {
+final File commonZip = new File(rootTargetDirectory,
+"com.adobe.air.compiler.adt.".replace(".", File.separator)
+ airSdkVersion +
+File.separator + "adt-" + airSdkVersion +
"-common.zip");
+generateZip(binDir, commonZip, new FilenameFilter() {
+@Override
+public boolean accept(File dir, String name) {
+return "adt".equals(name) || "adt.bat".equals(name) ||
+"adl".equals(name) || "adl.exe".equals(name);
+}
+});
+}
+
// Generate the android package (android directory)
File androidDir = new File(directory, "android");
if (androidDir.exists() && androidDir.isDirectory()) {
final File androidZip = new File(rootTargetDirectory,
"com.adobe.air.compiler.adt.".replace(".", File.separator)
+ airSdkVersion +
File.separator + "adt-" + airSdkVersion +
"-android.zip");
-generateCompilerPlatformArtifact(androidDir, androidZip);
+generateZip(androidDir, androidZip);
}
// Generate the ios package (aot directory)
@@ -109,7 +128,7 @@ public class AirConverter extends BaseConverter implements
Converter {
final File iosZip = new File(rootTargetDirectory,
"com.adobe.air.compiler.adt.".replace(".", File.separator)
+ airSdkVersion +
git commit: [flex-asjs] [refs/heads/develop] - - Removed the "Basic" module from the distribution
Repository: flex-asjs Updated Branches: refs/heads/develop 6a0e73ac3 -> 1005316f1 - Removed the "Basic" module from the distribution Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1005316f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1005316f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1005316f Branch: refs/heads/develop Commit: 1005316f1dc3891d0c03a10bdea01a8b7c54898f Parents: 6a0e73a Author: Christofer Dutz Authored: Thu Jan 26 22:19:32 2017 +0100 Committer: Christofer Dutz Committed: Thu Jan 26 22:19:49 2017 +0100 -- distribution/pom.xml | 13 - 1 file changed, 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1005316f/distribution/pom.xml -- diff --git a/distribution/pom.xml b/distribution/pom.xml index 7ac2aa4..e5cfdd1 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -80,12 +80,6 @@ org.apache.flex.flexjs.framework - Basic - 0.8.0-SNAPSHOT - swc - - - org.apache.flex.flexjs.framework Binding 0.8.0-SNAPSHOT swc @@ -220,13 +214,6 @@ org.apache.flex.flexjs.framework - Basic - 0.8.0-SNAPSHOT - swc - typedefs - - - org.apache.flex.flexjs.framework Binding 0.8.0-SNAPSHOT swc
[2/2] git commit: [flex-asjs] [refs/heads/develop] - - Added a new flexjs-sdk-description.xml
- Added a new flexjs-sdk-description.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2fe754fe
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2fe754fe
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2fe754fe
Branch: refs/heads/develop
Commit: 2fe754feaec8c4da67b7e448414a22ce07db8907
Parents: 25195f5
Author: Christofer Dutz
Authored: Wed Jan 25 23:16:19 2017 +0100
Committer: Christofer Dutz
Committed: Wed Jan 25 23:16:59 2017 +0100
--
distribution/src/main/assembly/component.xml| 1 +
.../main/resources/flexjs-sdk-description.xml | 32
2 files changed, 33 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2fe754fe/distribution/src/main/assembly/component.xml
--
diff --git a/distribution/src/main/assembly/component.xml
b/distribution/src/main/assembly/component.xml
index 419777d..a27dc15 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -167,6 +167,7 @@ under the License.
flex-sdk-description.xml
+flexjs-sdk-description.xml
true
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2fe754fe/distribution/src/main/resources/flexjs-sdk-description.xml
--
diff --git a/distribution/src/main/resources/flexjs-sdk-description.xml
b/distribution/src/main/resources/flexjs-sdk-description.xml
new file mode 100644
index 000..f566f20
--- /dev/null
+++ b/distribution/src/main/resources/flexjs-sdk-description.xml
@@ -0,0 +1,32 @@
+
+
+
+ Apache Flex: FlexJS ${project.version} FP${flash.version}
AIR${air.version} en_US
+ ${project.version}
+ ${timestamp}
+ default
+ en_US
+
+${flash.version}
+
+
+${air.version}
+
+
[1/2] git commit: [flex-asjs] [refs/heads/develop] - - Commented out faulty code ...
Repository: flex-asjs Updated Branches: refs/heads/develop 25195f5fd -> 5d87a38c8 - Commented out faulty code ... Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5d87a38c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5d87a38c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5d87a38c Branch: refs/heads/develop Commit: 5d87a38c8a8a56ba2d009bb9aa84157afa741a26 Parents: 2fe754f Author: Christofer Dutz Authored: Wed Jan 25 23:16:37 2017 +0100 Committer: Christofer Dutz Committed: Wed Jan 25 23:16:59 2017 +0100 -- .../src/main/flex/itemRenderers/MemberItemRenderer.mxml| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5d87a38c/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml index ae78d4c..1cb755e 100644 --- a/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml +++ b/examples/flexjs/FlexTeamPage_MDL/src/main/flex/itemRenderers/MemberItemRenderer.mxml @@ -52,7 +52,7 @@ limitations under the License. - +
git commit: [flex-asjs] [refs/heads/develop] - - Added some missing dependencies to the "Basic" module - Added some missing dependencies to the "FontAwesome" module and fixed some wrong dependencies -
Repository: flex-asjs Updated Branches: refs/heads/develop deb9bf46a -> e54023ece - Added some missing dependencies to the "Basic" module - Added some missing dependencies to the "FontAwesome" module and fixed some wrong dependencies - Added a dependency to the MaterialDesignLight typdef Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e54023ec Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e54023ec Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e54023ec Branch: refs/heads/develop Commit: e54023ecec832477cd84903ccaea9dd57919de32 Parents: deb9bf4 Author: Christofer Dutz Authored: Mon Jan 16 22:18:39 2017 +0100 Committer: Christofer Dutz Committed: Mon Jan 16 22:18:39 2017 +0100 -- distribution/pom.xml | 35 +++ 1 file changed, 31 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e54023ec/distribution/pom.xml -- diff --git a/distribution/pom.xml b/distribution/pom.xml index 875f65d..7ac2aa4 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -80,6 +80,12 @@ org.apache.flex.flexjs.framework + Basic + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework Binding 0.8.0-SNAPSHOT swc @@ -128,6 +134,12 @@ org.apache.flex.flexjs.framework + FontAwesome + 0.8.0-SNAPSHOT + swc + + + org.apache.flex.flexjs.framework Formatters 0.8.0-SNAPSHOT swc @@ -208,6 +220,13 @@ org.apache.flex.flexjs.framework + Basic + 0.8.0-SNAPSHOT + swc + typedefs + + + org.apache.flex.flexjs.framework Binding 0.8.0-SNAPSHOT swc @@ -262,18 +281,19 @@ swc typedefs - + org.apache.flex.flexjs.framework - Formatters + FontAwesome 0.8.0-SNAPSHOT swc typedefs - + org.apache.flex.flexjs.framework - FontAwesome + Formatters 0.8.0-SNAPSHOT swc + typedefs org.apache.flex.flexjs.framework @@ -319,6 +339,13 @@ org.apache.flex.flexjs.framework + MaterialDesignLite + 0.8.0-SNAPSHOT + swc + typedefs + + + org.apache.flex.flexjs.framework Mobile 0.8.0-SNAPSHOT swc
git commit: [flex-asjs] [refs/heads/develop] - - Fixed some problems in the generation of the templates/swfobject directory in the distribution
Repository: flex-asjs
Updated Branches:
refs/heads/develop e863dd135 -> deb9bf46a
- Fixed some problems in the generation of the templates/swfobject directory in
the distribution
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/deb9bf46
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/deb9bf46
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/deb9bf46
Branch: refs/heads/develop
Commit: deb9bf46a311a0956762ab3bf4b4af2db3350f9a
Parents: e863dd1
Author: Christofer Dutz
Authored: Mon Jan 16 21:51:01 2017 +0100
Committer: Christofer Dutz
Committed: Mon Jan 16 21:52:19 2017 +0100
--
distribution/pom.xml | 7 ---
distribution/src/main/assembly/component.xml | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/deb9bf46/distribution/pom.xml
--
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a4eeb43..875f65d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -501,7 +501,7 @@
2.2
jar
${project.build.directory}/swfobject-temp
-
META-INF/resources/webjars/swfobject/*/**
+ META-INF/resources/**
@@ -640,7 +640,7 @@
-
+
maven-assembly-plugin
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/deb9bf46/distribution/src/main/assembly/component.xml
--
diff --git a/distribution/src/main/assembly/component.xml
b/distribution/src/main/assembly/component.xml
index 3b5621c..419777d 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -187,7 +187,7 @@ under the License.
- src/main/resources/templates/swfobject
+ ../templates/swfobject
templates/swfobject
**
git commit: [flex-asjs] [refs/heads/develop] - - Fixed a bug in the distribution causing a false name for the playerglobal directory.
Repository: flex-asjs
Updated Branches:
refs/heads/develop dddc9e723 -> 8e4556d46
- Fixed a bug in the distribution causing a false name for the playerglobal
directory.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8e4556d4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8e4556d4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8e4556d4
Branch: refs/heads/develop
Commit: 8e4556d46f28936b0b392224bbb668d884555cfa
Parents: dddc9e7
Author: Christofer Dutz
Authored: Mon Jan 16 16:22:09 2017 +0100
Committer: Christofer Dutz
Committed: Mon Jan 16 16:22:09 2017 +0100
--
distribution/src/main/assembly/component-flash.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e4556d4/distribution/src/main/assembly/component-flash.xml
--
diff --git a/distribution/src/main/assembly/component-flash.xml
b/distribution/src/main/assembly/component-flash.xml
index 8f15acb..a00f666 100644
--- a/distribution/src/main/assembly/component-flash.xml
+++ b/distribution/src/main/assembly/component-flash.xml
@@ -22,7 +22,7 @@ under the License.
false
- frameworks/libs/player/${flashVersion}
+
frameworks/libs/player/${flash.version}
com.adobe.flash.framework:playerglobal:swc
[2/4] git commit: [flex-asjs] [refs/heads/develop] - Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c6ca72a2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c6ca72a2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c6ca72a2 Branch: refs/heads/develop Commit: c6ca72a2fa2e6f5079d9701ac0e2f432e498165e Parents: b5cfb64 dd51e84 Author: Christofer Dutz Authored: Fri Jan 13 14:26:44 2017 +0100 Committer: Christofer Dutz Committed: Fri Jan 13 14:26:44 2017 +0100 -- .../MDLExample/src/main/flex/Buttons.mxml | 48 +++--- .../MDLExample/src/main/flex/Footers.mxml | 53 .../src/main/flex/MainNavigation.mxml | 3 +- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 4 +- .../MDLExample/src/main/flex/Toggles.mxml | 13 - .../src/main/flex/models/MainNavigationModel.as | 3 +- frameworks/flex-config-template.xml | 18 +++ frameworks/flex-config.xml | 18 +++ .../main/flex/org/apache/flex/html/DataGrid.as | 30 +++ .../accessories/NumericOnlyTextInputBead.as | 4 +- .../org/apache/flex/html/beads/DataGridView.as | 20 .../flex/mdl/materialIcons/MaterialIconMood.as | 52 +++ .../flex/mdl/materialIcons/MaterialIconsType.as | 1 + .../src/main/resources/mdl-manifest.xml | 1 + 14 files changed, 235 insertions(+), 33 deletions(-) --
[4/4] git commit: [flex-asjs] [refs/heads/develop] - - Added some tests for the FlexJSStore example
- Added some tests for the FlexJSStore example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/34998d82
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/34998d82
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/34998d82
Branch: refs/heads/develop
Commit: 34998d828f850c0e422525a1d456fdbe76692c9c
Parents: 060352c
Author: Christofer Dutz
Authored: Fri Jan 13 16:07:13 2017 +0100
Committer: Christofer Dutz
Committed: Fri Jan 13 16:07:13 2017 +0100
--
examples/examples-integrationtests/pom.xml | 5 +
.../apache/flex/flexjs/examples/AbstractIT.java | 35 ++
.../flex/flexjs/examples/HelloWorldIT.java | 57 --
.../examples/flexjsstore/FlexJSStoreIT.java | 108 +++
.../examples/helloworld/HelloWorldIT.java | 44
5 files changed, 192 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/34998d82/examples/examples-integrationtests/pom.xml
--
diff --git a/examples/examples-integrationtests/pom.xml
b/examples/examples-integrationtests/pom.xml
index a774717..c4a62d8 100644
--- a/examples/examples-integrationtests/pom.xml
+++ b/examples/examples-integrationtests/pom.xml
@@ -56,6 +56,11 @@
+
+
+**/Abstract*.java
+
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/34998d82/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/AbstractIT.java
--
diff --git
a/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/AbstractIT.java
b/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/AbstractIT.java
new file mode 100644
index 000..e9c5b89
--- /dev/null
+++
b/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/AbstractIT.java
@@ -0,0 +1,35 @@
+package org.apache.flex.flexjs.examples;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.openqa.selenium.firefox.FirefoxDriver;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by christoferdutz on 13.01.17.
+ */
+public abstract class AbstractIT {
+
+protected static FirefoxDriver driver;
+
+@BeforeClass
+public static void openBrowser() {
+driver = new FirefoxDriver();
+driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
+}
+
+@AfterClass
+public static void closeBrowser() {
+if(driver != null) {
+driver.quit();
+}
+}
+
+protected void initTest() {
+driver.get("http://localhost:8082/"+ getContext() +"/index.html");
+}
+
+protected abstract String getContext();
+
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/34998d82/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java
--
diff --git
a/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java
b/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java
deleted file mode 100644
index be43d25..000
---
a/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *
- * 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.flexjs.examples;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.firefox.FirefoxDriver;
-
-import java.util.concurrent.TimeUnit;
-
-public class HelloWorldIT {
-
-private static FirefoxDriver driver;
-
-@BeforeCla
[1/4] git commit: [flex-asjs] [refs/heads/develop] - - Added all the other examples to the integration-test project
Repository: flex-asjs Updated Branches: refs/heads/develop dd51e840b -> 34998d828 - Added all the other examples to the integration-test project Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b5cfb64a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b5cfb64a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b5cfb64a Branch: refs/heads/develop Commit: b5cfb64a28cd6652c6e57f0b5b190944b34465b4 Parents: 3727c35 Author: Christofer Dutz Authored: Fri Jan 13 14:26:32 2017 +0100 Committer: Christofer Dutz Committed: Fri Jan 13 14:26:32 2017 +0100 -- examples/examples-integrationtests/pom.xml | 264 1 file changed, 264 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b5cfb64a/examples/examples-integrationtests/pom.xml -- diff --git a/examples/examples-integrationtests/pom.xml b/examples/examples-integrationtests/pom.xml index 7553009..a774717 100644 --- a/examples/examples-integrationtests/pom.xml +++ b/examples/examples-integrationtests/pom.xml @@ -101,9 +101,129 @@ org.apache.flex.flexjs.examples + ASDoc + war + + + org.apache.flex.flexjs.examples + ChartExample + war + + + org.apache.flex.flexjs.examples + CreateJSExample + war + + + org.apache.flex.flexjs.examples + DataBindingExample + war + + + org.apache.flex.flexjs.examples + DataBindingExample_as + war + + + org.apache.flex.flexjs.examples + DataBindingExample_Flat + war + + + org.apache.flex.flexjs.examples + DataGridExample + war + + + org.apache.flex.flexjs.examples + DateControlsExample + war + + + org.apache.flex.flexjs.examples + DesktopMap + war + + + org.apache.flex.flexjs.examples + FlexJSStore + war + + + org.apache.flex.flexjs.examples + FlexJSStore_jquery + war + + + org.apache.flex.flexjs.examples + FlexTeamPage_MDL + war + + + org.apache.flex.flexjs.examples + FlexWebsiteStatsViewer + war + + + org.apache.flex.flexjs.examples HelloWorld war + + org.apache.flex.flexjs.examples + ListExample + war + + + org.apache.flex.flexjs.examples + MapSearch + war + + + org.apache.flex.flexjs.examples + MDLExample + war + + + org.apache.flex.flexjs.examples + MobileMap + war + + + org.apache.flex.flexjs.examples + MobileStocks + war + + + org.apache.flex.flexjs.examples + MobileTrader + war + + + org.apache.flex.flexjs.examples + StorageExample + war + + + org.apache.flex.flexjs.examples + StyleExample + war + + + org.apache.flex.flexjs.examples + TeamPage + war + + + org.apache.flex.flexjs.examples + TodoListSampleApp + war + + + org.apache.flex.flexjs.examples + TreeExample + war + @@ -116,10 +
[3/4] git commit: [flex-asjs] [refs/heads/develop] - - Commented out an expression which was causing errors with binding if the element being bound to is null. - Added some ids to fields to allow auto
- Commented out an expression which was causing errors with binding if the element being bound to is null. - Added some ids to fields to allow automated testing - Added some beads to the phone number fields to make them numeric and to the password field to make it a password field. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/060352c1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/060352c1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/060352c1 Branch: refs/heads/develop Commit: 060352c1530b2b17e6ccfeb98d667af40bf49a65 Parents: c6ca72a Author: Christofer Dutz Authored: Fri Jan 13 15:45:59 2017 +0100 Committer: Christofer Dutz Committed: Fri Jan 13 15:45:59 2017 +0100 -- .../FlexJSStore/src/main/flex/HomeView.mxml | 28 +++- .../main/flex/productsView/ProductDetails.mxml | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/060352c1/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml -- diff --git a/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml b/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml index 9021084..866811c 100755 --- a/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml +++ b/examples/flexjs/FlexJSStore/src/main/flex/HomeView.mxml @@ -57,8 +57,8 @@ Width and height are hard-coded in the root tag to help the Design view. - - + + @@ -102,15 +102,31 @@ Width and height are hard-coded in the root tag to help the Design view. - + + + + + - + + + + + - + + + + + - + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/060352c1/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductDetails.mxml -- diff --git a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductDetails.mxml b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductDetails.mxml index 781d120..5deff16 100755 --- a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductDetails.mxml +++ b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductDetails.mxml @@ -107,7 +107,7 @@ limitations under the License. - +
git commit: [flex-asjs] [refs/heads/develop] - - Added FlexTeamPage_MDL example to the maven build
Repository: flex-asjs Updated Branches: refs/heads/develop 2ca8651d9 -> 3727c359c - Added FlexTeamPage_MDL example to the maven build Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3727c359 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3727c359 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3727c359 Branch: refs/heads/develop Commit: 3727c359ceefa623a26c9d13f11a8ccd68412f8c Parents: 2ca8651 Author: Christofer Dutz Authored: Wed Jan 11 02:38:36 2017 +0100 Committer: Christofer Dutz Committed: Wed Jan 11 02:38:36 2017 +0100 -- examples/flexjs/pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3727c359/examples/flexjs/pom.xml -- diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml index 8bb59d5..c87be3d 100644 --- a/examples/flexjs/pom.xml +++ b/examples/flexjs/pom.xml @@ -47,6 +47,7 @@ DesktopMap FlexJSStore FlexJSStore_jquery +FlexTeamPage_MDL FlexWebsiteStatsViewer HelloWorld ListExample
git commit: [flex-asjs] [refs/heads/develop] - - Added selenium webdriver integrationtests - Added a simple testcase to test the HelloWorld application as a template
Repository: flex-asjs
Updated Branches:
refs/heads/develop bed2b2437 -> 6913fa1cd
- Added selenium webdriver integrationtests
- Added a simple testcase to test the HelloWorld application as a template
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6913fa1c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6913fa1c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6913fa1c
Branch: refs/heads/develop
Commit: 6913fa1cdd9669961a87c847ddc67bea206b88b0
Parents: bed2b24
Author: Christofer Dutz
Authored: Sun Jan 8 20:16:21 2017 +0100
Committer: Christofer Dutz
Committed: Sun Jan 8 20:16:38 2017 +0100
--
examples/examples-integrationtests/pom.xml | 139 +++
.../flex/flexjs/examples/HelloWorldIT.java | 57
examples/pom.xml| 1 +
3 files changed, 197 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6913fa1c/examples/examples-integrationtests/pom.xml
--
diff --git a/examples/examples-integrationtests/pom.xml
b/examples/examples-integrationtests/pom.xml
new file mode 100644
index 000..7553009
--- /dev/null
+++ b/examples/examples-integrationtests/pom.xml
@@ -0,0 +1,139 @@
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ 4.0.0
+
+
+org.apache.flex.flexjs.examples
+examples
+0.8.0-SNAPSHOT
+
+
+ examples-integrationtests
+ 0.8.0-SNAPSHOT
+ jar
+
+ Apache Flex - FlexJS: Examples: Integrationtests
+
+
+
+ integrationtests
+
+
+ webdriver.gecko.driver
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+2.19.1
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+
+org.codehaus.cargo
+cargo-maven2-plugin
+1.6.2
+true
+
+
+start
+pre-integration-test
+
+ start
+
+
+
+stop
+post-integration-test
+
+ stop
+
+
+
+
+
+tomcat8x
+${project.build.directory}/tomcat8x/container.log
+
+
http://ftp.fau.de/apache/tomcat/tomcat-8/v8.5.9/bin/apache-tomcat-8.5.9.zip
+ ${java.io.tmpdir}/cargo/installs
+
+
+18
+
+
+standalone
+${project.build.directory}/tomcat8x/container
+
+ 8082
+ admin::manager
+
+
+
+
+ org.apache.flex.flexjs.examples
+ HelloWorld
+ war
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.flex.flexjs.examples
+ HelloWorld
+ 0.8.0-SNAPSHOT
+ war
+
+
+
+
+ org.seleniumhq.selenium
+ selenium-firefox-driver
+ 3.0.1
+ test
+
+
+ junit
+ junit
+ 4.10
+ test
+
+
+
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6913fa1c/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java
--
diff --git
a/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java
b/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java
new file mode 100644
index 000..be43d25
--- /dev/null
+++
b/examples/examples-integrationtests/src/test/java/org/apache/flex/flexjs/examples/HelloWorldIT.java
@@ -0,0 +1,57 @@
+/*
+ *
+ * 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 requ
git commit: [flex-asjs] [refs/heads/develop] - - Updated the archetypes -- Added pure-swf archetype -- Added pure-js archetype -- Fixed some issues in the normal application archetype
Repository: flex-asjs
Updated Branches:
refs/heads/develop f79e7caff -> 729304cf2
- Updated the archetypes
-- Added pure-swf archetype
-- Added pure-js archetype
-- Fixed some issues in the normal application archetype
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/729304cf
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/729304cf
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/729304cf
Branch: refs/heads/develop
Commit: 729304cf2b7014c41540eb32c0e6f5cfab977350
Parents: f79e7ca
Author: Christofer Dutz
Authored: Wed Jan 4 20:23:21 2017 +0100
Committer: Christofer Dutz
Committed: Wed Jan 4 20:23:21 2017 +0100
--
.../main/resources/archetype-resources/pom.xml | 57 +++-
.../pom.xml | 36 +
.../main/resources/META-INF/maven/archetype.xml | 27
.../archetype-resources/.mvn/extensions.xml | 30
.../main/resources/archetype-resources/pom.xml | 141 +++
.../archetype-resources/src/main/flex/App.mxml | 30
.../pom.xml | 42 ++
.../main/resources/META-INF/maven/archetype.xml | 27
.../archetype-resources/.mvn/extensions.xml | 30
.../main/resources/archetype-resources/pom.xml | 84 +++
.../archetype-resources/src/main/flex/App.mxml | 30
archetypes/pom.xml | 2 +
12 files changed, 535 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/729304cf/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
--
diff --git
a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
index 23392a6..d3930c7 100644
---
a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -27,6 +27,11 @@
\${version}
swf
+
+true
+target/javascript/bin/js-debug
+
+
src/main/flex
@@ -36,7 +41,6 @@
${flexjs.compiler.version}
true
- ${flash.version}
App.mxml
@@ -48,6 +52,7 @@
compile-app
+ \${compiler.debug}
true
@@ -60,6 +65,46 @@
+
+org.apache.maven.plugins
+maven-war-plugin
+2.6
+
+
+package-javascript
+package
+
+ war
+
+
+
+
+ \${compiler.output-dir}
+ false
+
+
+
+org.codehaus.mojo
+build-helper-maven-plugin
+1.11
+
+
+attach-war
+package
+
+ attach-artifact
+
+
+
+
+
+
+ target/\${artifactId}-\${version}.war
+ war
+
+
+
+
@@ -95,4 +140,14 @@
+
+
+ release
+
+false
+
target/javascript/bin/js-release
+
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/729304cf/archetypes/flexjs-simple-application-pure-js-archetype/pom.xml
--
diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/pom.xml
b/archetypes/flexjs-simple-application-pure-js-archetype/pom.xml
new file mode 100644
index 000..9b9ee94
--- /dev/null
+++ b/archetypes/flexjs-simple-application-pure-js-archetype/pom.xml
@@ -0,0 +1,36 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ 4.0.0
+
+
+org.apache.flex.flexjs.framework
+flexjs-maven-archetypes
+0.8.0-SNAPSHOT
+
+
+ flexjs-simple-application-pure-js-archetype
+ 0.8.0-SNAPSHOT
+ jar
+
+ Apache Flex - FlexJS: Framework: Archetypes: Simple FlexJS Pure-JS
Application
+ Maven archetype for creating FlexJS Maven project for building
a simple FlexJS application with only JavaScript output.
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/729304cf/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/META-INF/maven/archetype.xml
-
[2/3] git commit: [flex-asjs] [refs/heads/feature-autobuild/cleanup] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ebd5ba9f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ebd5ba9f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ebd5ba9f Branch: refs/heads/feature-autobuild/cleanup Commit: ebd5ba9fda45f1a0a1d89e06d90114a403a09801 Parents: b977879 2d58e54 Author: yishayw Authored: Tue Dec 27 12:59:45 2016 +0200 Committer: yishayw Committed: Tue Dec 27 12:59:45 2016 +0200 -- pom.xml | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) --
git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - - Tried to add the dependencies to the Ant download scripts ...
Repository: flex-falcon Updated Branches: refs/heads/feature-autobuild/cleanup c6e05858d -> 863d0013f - Tried to add the dependencies to the Ant download scripts ... Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/863d0013 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/863d0013 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/863d0013 Branch: refs/heads/feature-autobuild/cleanup Commit: 863d0013f7933301365ebc2b01138fd5be57d68f Parents: c6e0585 Author: Christofer Dutz Authored: Fri Dec 30 17:37:19 2016 +0100 Committer: Christofer Dutz Committed: Fri Dec 30 17:37:19 2016 +0100 -- compiler/src/main/resources/downloads.xml | 27 - compiler/src/test/downloads.xml | 54 +- 2 files changed, 79 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/863d0013/compiler/src/main/resources/downloads.xml -- diff --git a/compiler/src/main/resources/downloads.xml b/compiler/src/main/resources/downloads.xml index 25a5501..d57abe0 100644 --- a/compiler/src/main/resources/downloads.xml +++ b/compiler/src/main/resources/downloads.xml @@ -139,7 +139,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/863d0013/compiler/src/test/downloads.xml -- diff --git a/compiler/src/test/downloads.xml b/compiler/src/test/downloads.xml index 467685a..4a2c370 100644 --- a/compiler/src/test/downloads.xml +++ b/compiler/src/test/downloads.xml @@ -51,7 +51,7 @@ they are each downloaded only if they don't already exist. --> - @@ -138,6 +138,58 @@ + + + + + + + + + + + + + + + + +http://search.maven.org/remotecontent?filepath=org/apache/logging/log4j/log4j-core/2.7"/> + + + + + + + + + + + + + + + + + + + + + +http://search.maven.org/remotecontent?filepath=org/apache/logging/log4j/log4j-api/2.7"/> + + + + + + +
[3/3] git commit: [flex-asjs] [refs/heads/feature-autobuild/cleanup] - Merge branches 'develop' and 'feature-autobuild/cleanup' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature-autobu
Merge branches 'develop' and 'feature-autobuild/cleanup' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature-autobuild/cleanup Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ac6f03ec Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ac6f03ec Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ac6f03ec Branch: refs/heads/feature-autobuild/cleanup Commit: ac6f03ec12ab43a1bcf11dd1efb4cb30e0f97091 Parents: 9b37ca0 ebd5ba9 Author: Christofer Dutz Authored: Tue Dec 27 21:18:39 2016 +0100 Committer: Christofer Dutz Committed: Tue Dec 27 21:18:39 2016 +0100 -- .../projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as| 6 ++ 1 file changed, 6 insertions(+) --
[1/3] git commit: [flex-asjs] [refs/heads/feature-autobuild/cleanup] - Fix incorrect transformElement
Repository: flex-asjs
Updated Branches:
refs/heads/feature-autobuild/cleanup 9b37ca0c4 -> ac6f03ec1
Fix incorrect transformElement
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b977879e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b977879e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b977879e
Branch: refs/heads/feature-autobuild/cleanup
Commit: b977879ebe12f4821d9fadadd67f95db56b57a91
Parents: 85c0804
Author: yishayw
Authored: Tue Dec 27 12:58:51 2016 +0200
Committer: yishayw
Committed: Tue Dec 27 12:58:51 2016 +0200
--
.../projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as| 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b977879e/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as
--
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as
index 14f153e..b1a57a3 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as
@@ -147,6 +147,12 @@ package org.apache.flex.svg
}
}
+ COMPILE::JS
+ override public function get
transformElement():WrappedHTMLElement
+ {
+ return _rect;
+ }
+
override protected function draw():void
{
drawRect(0,0,width,height);
[2/3] git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework
- Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fb881d1a Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fb881d1a Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fb881d1a Branch: refs/heads/feature-autobuild/cleanup Commit: fb881d1a58b81531abc8d0d8f269fb643a369272 Parents: 65589d3 Author: Christofer Dutz Authored: Mon Dec 26 17:25:00 2016 +0100 Committer: Christofer Dutz Committed: Mon Dec 26 17:25:18 2016 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fb881d1a/pom.xml -- diff --git a/pom.xml b/pom.xml index be7e1c6..ed942cb 100644 --- a/pom.xml +++ b/pom.xml @@ -428,7 +428,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin -3.0.2 +3.2
[1/3] git commit: [flex-asjs] [refs/heads/feature-autobuild/cleanup] - Fix getScreenBoundingRect() for svg elements.
Repository: flex-asjs
Updated Branches:
refs/heads/feature-autobuild/cleanup ce47719a4 -> 9b37ca0c4
Fix getScreenBoundingRect() for svg elements.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/85c08046
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/85c08046
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/85c08046
Branch: refs/heads/feature-autobuild/cleanup
Commit: 85c080468af4d1b1bd8602b9e284f5b6c211a845
Parents: d277641
Author: yishayw
Authored: Mon Dec 26 11:18:03 2016 +0200
Committer: yishayw
Committed: Mon Dec 26 11:18:03 2016 +0200
--
.../flex/org/apache/flex/utils/DisplayUtils.as | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/85c08046/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as
--
diff --git
a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as
b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as
index 483ab41..ac66a19 100644
---
a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as
+++
b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/DisplayUtils.as
@@ -19,7 +19,14 @@
package org.apache.flex.utils
{
import org.apache.flex.core.IUIBase;
- import org.apache.flex.geom.Rectangle
+ import org.apache.flex.geom.Rectangle;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.geom.Matrix;
+ import org.apache.flex.geom.Point;
+ import org.apache.flex.core.ITransformHost;
+ }
/**
* The SpriteUtils class is a collection of static functions that are
useful
* for geometric operations on visible objects.
@@ -42,6 +49,7 @@ package org.apache.flex.utils
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
* @flexjsignorecoercion HTMLElement
+ * @flexjsignorecoercion ITransformHost
*/
public static function
getScreenBoundingRect(obj:IUIBase):Rectangle
{
@@ -53,9 +61,21 @@ package org.apache.flex.utils
COMPILE::JS
{
var r:Object = (obj.element as
HTMLElement).getBoundingClientRect();
- var bounds:Rectangle = new Rectangle(r.x, r.y,
r.width, r.height);
+ var bounds:Rectangle = new Rectangle(r.left,
r.top, r.right - r.left, r.bottom - r.top);
bounds.x -= window.pageXOffset;
bounds.y -= window.pageYOffset;
+ if (obj.element instanceof SVGElement)
+ {
+ var svgElement:Object = (obj as
ITransformHost).transformElement as Object;
+ var sm:SVGMatrix =
svgElement.getScreenCTM();
+ var m:Matrix = new
Matrix(sm.a,sm.b,sm.c,sm.d,sm.e,sm.f);
+ var tl:Point =
m.transformPoint(bounds.topLeft);
+ var br:Point =
m.transformPoint(bounds.bottomRight);
+ bounds.top = tl.y;
+ bounds.left = tl.x;
+ bounds.bottom = br.y;
+ bounds.right = br.x;
+ }
return bounds;
}
}
[3/3] git commit: [flex-asjs] [refs/heads/feature-autobuild/cleanup] - Merge branches 'develop' and 'feature-autobuild/cleanup' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature-autobu
Merge branches 'develop' and 'feature-autobuild/cleanup' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature-autobuild/cleanup Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9b37ca0c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9b37ca0c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9b37ca0c Branch: refs/heads/feature-autobuild/cleanup Commit: 9b37ca0c4ab8d02807d0e3791a17cbe91b176971 Parents: ce47719 2d58e54 Author: Christofer Dutz Authored: Mon Dec 26 17:26:11 2016 +0100 Committer: Christofer Dutz Committed: Mon Dec 26 17:26:11 2016 +0100 -- .../flex/org/apache/flex/utils/DisplayUtils.as | 24 ++-- pom.xml | 13 +++ 2 files changed, 31 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9b37ca0c/pom.xml --
flex-typedefs git commit: - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework
Repository: flex-typedefs Updated Branches: refs/heads/feature-autobuild/cleanup 1b46e4097 -> 8646b6b5d - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/8646b6b5 Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/8646b6b5 Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/8646b6b5 Branch: refs/heads/feature-autobuild/cleanup Commit: 8646b6b5dc0363394bdebbc6c86de300692b2e2e Parents: 1b46e40 Author: Christofer Dutz Authored: Mon Dec 26 17:24:59 2016 +0100 Committer: Christofer Dutz Committed: Mon Dec 26 17:24:59 2016 +0100 -- pom.xml | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/8646b6b5/pom.xml -- diff --git a/pom.xml b/pom.xml index a6a28de..3e731fb 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,11 @@ 1.0.0 git + + +https://builds.apache.org/analysis + +file:**/generated-sources/** @@ -95,6 +100,12 @@ + +org.sonarsource.scanner.maven +sonar-maven-plugin +3.2 + + org.apache.rat
[2/3] git commit: [flex-asjs] [refs/heads/feature-autobuild/cleanup] - - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework
- Updated the sonarqube plugin
- Added sonarqube configuration to typedefs and framework
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2d58e545
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2d58e545
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2d58e545
Branch: refs/heads/feature-autobuild/cleanup
Commit: 2d58e545999c8c2a80ada87cd84598dca8a25e34
Parents: 85c0804
Author: Christofer Dutz
Authored: Mon Dec 26 17:24:59 2016 +0100
Committer: Christofer Dutz
Committed: Mon Dec 26 17:24:59 2016 +0100
--
pom.xml | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2d58e545/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 67695d2..a32cbaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,10 +65,9 @@
31
-https://analysis.apache.org/
-
-
${project.build.directory}/coverage-reports/jacoco-ut.exec
-
${project.build.directory}/coverage-reports/jacoco-it.exec
+https://builds.apache.org/analysis
+
+file:**/generated-sources/**
@@ -134,6 +133,12 @@
+
+
+ org.sonarsource.scanner.maven
+ sonar-maven-plugin
+ 3.2
+
[3/3] git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - Merge branches 'develop' and 'feature-autobuild/cleanup' of https://git-wip-us.apache.org/repos/asf/flex-falcon into feature-au
Merge branches 'develop' and 'feature-autobuild/cleanup' of https://git-wip-us.apache.org/repos/asf/flex-falcon into feature-autobuild/cleanup Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c6e05858 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c6e05858 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c6e05858 Branch: refs/heads/feature-autobuild/cleanup Commit: c6e05858d90f20c9e324434b212c78860eeaf9b5 Parents: 8c5429e fb881d1 Author: Christofer Dutz Authored: Mon Dec 26 17:26:25 2016 +0100 Committer: Christofer Dutz Committed: Mon Dec 26 17:26:25 2016 +0100 -- .../compiler/internal/codegen/js/flexjs/TestFlexJSProject.java | 1 + .../org/apache/flex/compiler/internal/test/FlexJSTestBase.java | 1 + pom.xml| 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) --
[1/3] git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - Fix tests
Repository: flex-falcon
Updated Branches:
refs/heads/feature-autobuild/cleanup 8c5429ed9 -> c6e05858d
Fix tests
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/65589d35
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/65589d35
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/65589d35
Branch: refs/heads/feature-autobuild/cleanup
Commit: 65589d353c467e1132163d3d7121d7f0e13024df
Parents: 7926477
Author: Alex Harui
Authored: Sun Dec 25 12:44:41 2016 -0800
Committer: Alex Harui
Committed: Sun Dec 25 12:44:41 2016 -0800
--
.../flex/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java | 1 +
.../java/org/apache/flex/compiler/internal/test/FlexJSTestBase.java | 1 +
2 files changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/65589d35/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
index 4114429..dbdb67c 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
@@ -58,6 +58,7 @@ public class TestFlexJSProject extends TestGoogProject
@Override
public void setUp()
{
+backend = createBackend();
project = new FlexJSProject(workspace, backend);
project.config = new JSGoogConfiguration();
super.setUp();
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/65589d35/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSTestBase.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSTestBase.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSTestBase.java
index 8a1116a..c3f379c 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSTestBase.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSTestBase.java
@@ -41,6 +41,7 @@ public class FlexJSTestBase extends TestBase
@Override
public void setUp()
{
+backend = createBackend();
project = new FlexJSProject(workspace, backend);
super.setUp();
flex-typedefs git commit: - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework
Repository: flex-typedefs Updated Branches: refs/heads/develop 1b46e4097 -> 8646b6b5d - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/8646b6b5 Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/8646b6b5 Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/8646b6b5 Branch: refs/heads/develop Commit: 8646b6b5dc0363394bdebbc6c86de300692b2e2e Parents: 1b46e40 Author: Christofer Dutz Authored: Mon Dec 26 17:24:59 2016 +0100 Committer: Christofer Dutz Committed: Mon Dec 26 17:24:59 2016 +0100 -- pom.xml | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/8646b6b5/pom.xml -- diff --git a/pom.xml b/pom.xml index a6a28de..3e731fb 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,11 @@ 1.0.0 git + + +https://builds.apache.org/analysis + +file:**/generated-sources/** @@ -95,6 +100,12 @@ + +org.sonarsource.scanner.maven +sonar-maven-plugin +3.2 + + org.apache.rat
git commit: [flex-falcon] [refs/heads/develop] - - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework
Repository: flex-falcon Updated Branches: refs/heads/develop 65589d353 -> fb881d1a5 - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fb881d1a Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fb881d1a Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fb881d1a Branch: refs/heads/develop Commit: fb881d1a58b81531abc8d0d8f269fb643a369272 Parents: 65589d3 Author: Christofer Dutz Authored: Mon Dec 26 17:25:00 2016 +0100 Committer: Christofer Dutz Committed: Mon Dec 26 17:25:18 2016 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/fb881d1a/pom.xml -- diff --git a/pom.xml b/pom.xml index be7e1c6..ed942cb 100644 --- a/pom.xml +++ b/pom.xml @@ -428,7 +428,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin -3.0.2 +3.2
git commit: [flex-asjs] [refs/heads/develop] - - Updated the sonarqube plugin - Added sonarqube configuration to typedefs and framework
Repository: flex-asjs
Updated Branches:
refs/heads/develop 85c080468 -> 2d58e5459
- Updated the sonarqube plugin
- Added sonarqube configuration to typedefs and framework
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2d58e545
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2d58e545
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2d58e545
Branch: refs/heads/develop
Commit: 2d58e545999c8c2a80ada87cd84598dca8a25e34
Parents: 85c0804
Author: Christofer Dutz
Authored: Mon Dec 26 17:24:59 2016 +0100
Committer: Christofer Dutz
Committed: Mon Dec 26 17:24:59 2016 +0100
--
pom.xml | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2d58e545/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 67695d2..a32cbaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,10 +65,9 @@
31
-https://analysis.apache.org/
-
-
${project.build.directory}/coverage-reports/jacoco-ut.exec
-
${project.build.directory}/coverage-reports/jacoco-it.exec
+https://builds.apache.org/analysis
+
+file:**/generated-sources/**
@@ -134,6 +133,12 @@
+
+
+ org.sonarsource.scanner.maven
+ sonar-maven-plugin
+ 3.2
+
git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - Removed the settings again as SonarQube seems to be unable to work with multiple branches :-(
Repository: flex-falcon Updated Branches: refs/heads/feature-autobuild/cleanup acba5bf54 -> 8c5429ed9 Removed the settings again as SonarQube seems to be unable to work with multiple branches :-( Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/8c5429ed Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/8c5429ed Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/8c5429ed Branch: refs/heads/feature-autobuild/cleanup Commit: 8c5429ed94f468efd79636f8165b51ca1d4dd954 Parents: acba5bf Author: Christofer Dutz Authored: Mon Dec 26 12:55:07 2016 +0100 Committer: Christofer Dutz Committed: Mon Dec 26 12:55:07 2016 +0100 -- compiler-jx/pom.xml | 5 - compiler-test-utils/pom.xml | 5 - compiler/pom.xml| 5 - debugger/pom.xml| 5 - flex-compiler-oem/pom.xml | 5 - flexjs-ant-tasks/pom.xml| 5 - flexjs-maven-plugin/pom.xml | 2 -- pom.xml | 2 -- 8 files changed, 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8c5429ed/compiler-jx/pom.xml -- diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index dca5980..733c8b0 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -31,11 +31,6 @@ Apache Flex - FlexJS: Compiler: Compiler-JX - - org.apache.flex.flexjs.compiler:compiler-jx-cleanup -Apache Flex - FlexJS: Compiler: Compiler-JX (cleanup) - - http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8c5429ed/compiler-test-utils/pom.xml -- diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index a4877e4..6707ce5 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -34,11 +34,6 @@ Shared test code, which is needed by the compiler and the compiler-jx test-suites. - - org.apache.flex.flexjs.compiler:compiler-test-utils-cleanup -Apache Flex - FlexJS: Compiler: Test Utils (cleanup) - - org.apache.commons http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/8c5429ed/compiler/pom.xml -- diff --git a/compiler/pom.xml b/compiler/pom.xml index 6f10e67..c34c7e0 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -32,11 +32,6 @@ Apache Flex - FlexJS: Compiler: Compiler The Apache Flex Falcon Compiler - - org.apache.flex.flexjs.compiler:compiler-cleanup -Apache Flex - FlexJS: Compiler: Compiler (cleanup) - - https://builds.apache.org/analysis
git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - Set the sonar modulekey for each module
Repository: flex-falcon Updated Branches: refs/heads/feature-autobuild/cleanup dc845c6ef -> acba5bf54 Set the sonar modulekey for each module Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/acba5bf5 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/acba5bf5 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/acba5bf5 Branch: refs/heads/feature-autobuild/cleanup Commit: acba5bf549b7dc63ba48577c52e76a452f337cf4 Parents: dc845c6 Author: Christofer Dutz Authored: Mon Dec 26 12:40:28 2016 +0100 Committer: Christofer Dutz Committed: Mon Dec 26 12:40:28 2016 +0100 -- compiler-jx/pom.xml | 3 ++- compiler-test-utils/pom.xml | 3 ++- compiler/pom.xml| 3 ++- debugger/pom.xml| 3 ++- flex-compiler-oem/pom.xml | 3 ++- flexjs-ant-tasks/pom.xml| 3 ++- flexjs-maven-plugin/pom.xml | 3 ++- pom.xml | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/acba5bf5/compiler-jx/pom.xml -- diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index dc3b7a2..dca5980 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -32,7 +32,8 @@ Apache Flex - FlexJS: Compiler: Compiler-JX - org.apache.flex.flexjs.compiler:compiler-jx:cleanup-branch + org.apache.flex.flexjs.compiler:compiler-jx-cleanup +Apache Flex - FlexJS: Compiler: Compiler-JX (cleanup) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/acba5bf5/compiler-test-utils/pom.xml -- diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index a65cce4..a4877e4 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -35,7 +35,8 @@ - org.apache.flex.flexjs.compiler:compiler-test-utils:cleanup-branch + org.apache.flex.flexjs.compiler:compiler-test-utils-cleanup +Apache Flex - FlexJS: Compiler: Test Utils (cleanup) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/acba5bf5/compiler/pom.xml -- diff --git a/compiler/pom.xml b/compiler/pom.xml index 60ca75a..6f10e67 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -33,7 +33,8 @@ The Apache Flex Falcon Compiler - org.apache.flex.flexjs.compiler:compiler:cleanup-branch + org.apache.flex.flexjs.compiler:compiler-cleanup +Apache Flex - FlexJS: Compiler: Compiler (cleanup) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/acba5bf5/debugger/pom.xml -- diff --git a/debugger/pom.xml b/debugger/pom.xml index 3e51a46..32ce3c3 100644 --- a/debugger/pom.xml +++ b/debugger/pom.xml @@ -32,7 +32,8 @@ Apache Flex - FlexJS: Compiler: Debugger - org.apache.flex.flexjs.compiler:debugger:cleanup-branch + org.apache.flex.flexjs.compiler:debugger-cleanup +Apache Flex - FlexJS: Compiler: Debugger (cleanup) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/acba5bf5/flex-compiler-oem/pom.xml -- diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml index d2ed03c..4c9c7c6 100644 --- a/flex-compiler-oem/pom.xml +++ b/flex-compiler-oem/pom.xml @@ -32,7 +32,8 @@ Apache Flex - FlexJS: Compiler: OEM Layer - org.apache.flex.flexjs.compiler:flex-compiler-oem:cleanup-branch + org.apache.flex.flexjs.compiler:flex-compiler-oem-cleanup +Apache Flex - FlexJS: Compiler: OEM Layer (cleanup) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/acba5bf5/flexjs-ant-tasks/pom.xml -- diff --git a/flexjs-ant-tasks/pom.xml b/flexjs-ant-tasks/pom.xml index 99354c6..0d3c54a 100644 --- a/flexjs-ant-tasks/pom.xml +++ b/flexjs-ant-tasks/pom.xml @@ -32,7 +32,8 @@ Apache Flex - FlexJS: FlexJS Ant Tasks - org.apache.flex.flexjs.compiler:flexjs-ant-tasks:cleanup-branch + org.apache.flex.flexjs.compiler:flexjs-ant-tasks-cleanup +Apache Flex - FlexJS: FlexJS Ant Tasks (cleanup) http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/acba5bf5/flexjs-maven-plugin/pom.xml -- diff --git a/flexjs-maven-plugin/pom.xml b/flexjs-maven-plugin/pom.xml index b9df8e9..cfb09d4 100644 --- a/flexjs-maven-plugin/pom.xml +++ b/flexjs-maven-plugin/pom.xml @@ -34,7 +34,8 @@ 3.3.1 - org.apache.flex.flexjs.compiler:flexjs-maven-plugin:cleanup-branch + org.apache.flex.flexjs
git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - Set the sonar modulekey for each module
Repository: flex-falcon Updated Branches: refs/heads/feature-autobuild/cleanup 87ad72a6d -> dc845c6ef Set the sonar modulekey for each module Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/dc845c6e Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/dc845c6e Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/dc845c6e Branch: refs/heads/feature-autobuild/cleanup Commit: dc845c6ef811942236cb505bb4ec23fa7dd949a9 Parents: 87ad72a Author: Christofer Dutz Authored: Sun Dec 25 21:44:38 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 25 21:44:38 2016 +0100 -- compiler-jx/pom.xml | 4 compiler-test-utils/pom.xml | 4 compiler/pom.xml| 4 debugger/pom.xml| 4 flex-compiler-oem/pom.xml | 4 flexjs-ant-tasks/pom.xml| 4 flexjs-maven-plugin/pom.xml | 1 + pom.xml | 1 + 8 files changed, 26 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dc845c6e/compiler-jx/pom.xml -- diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 733c8b0..dc3b7a2 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -31,6 +31,10 @@ Apache Flex - FlexJS: Compiler: Compiler-JX + + org.apache.flex.flexjs.compiler:compiler-jx:cleanup-branch + + http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dc845c6e/compiler-test-utils/pom.xml -- diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index 6707ce5..a65cce4 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -34,6 +34,10 @@ Shared test code, which is needed by the compiler and the compiler-jx test-suites. + + org.apache.flex.flexjs.compiler:compiler-test-utils:cleanup-branch + + org.apache.commons http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dc845c6e/compiler/pom.xml -- diff --git a/compiler/pom.xml b/compiler/pom.xml index c34c7e0..60ca75a 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -32,6 +32,10 @@ Apache Flex - FlexJS: Compiler: Compiler The Apache Flex Falcon Compiler + + org.apache.flex.flexjs.compiler:compiler:cleanup-branch + + https://builds.apache.org/analysis
[flex-typedefs] Git Push Summary
Repository: flex-typedefs Updated Branches: refs/heads/faeture-autobuild/cleanup [deleted] 3313c5b2d
[flex-typedefs] Git Push Summary
Repository: flex-typedefs Updated Branches: refs/heads/feature-autobuild/cleanup [created] 1b46e4097
flex-typedefs git commit: - Replaced System.out.print(ln) and System.err.print(ln) statements with Log4J 2 calls.
Repository: flex-typedefs Updated Branches: refs/heads/faeture-autobuild/cleanup 1b46e4097 -> 3313c5b2d - Replaced System.out.print(ln) and System.err.print(ln) statements with Log4J 2 calls. Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/3313c5b2 Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/3313c5b2 Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/3313c5b2 Branch: refs/heads/faeture-autobuild/cleanup Commit: 3313c5b2dda2e3391e185a342f66889dd6a22b7b Parents: 1b46e40 Author: Christofer Dutz Authored: Sun Dec 25 20:54:56 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 25 20:54:56 2016 +0100 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/3313c5b2/pom.xml -- diff --git a/pom.xml b/pom.xml index a6a28de..5f704c4 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,8 @@ Apache Flex - FlexJS: TypeDefs: Parent + + scm:git:https://git-wip-us.apache.org/repos/asf/flex-typedefs.git scm:git:https://git-wip-us.apache.org/repos/asf/flex-typedefs.git
git commit: [flex-asjs] [refs/heads/feature-autobuild/cleanup] - - Replaced System.out.print(ln) and System.err.print(ln) statements with Log4J 2 calls.
Repository: flex-asjs Updated Branches: refs/heads/feature-autobuild/cleanup d277641ed -> ce47719a4 - Replaced System.out.print(ln) and System.err.print(ln) statements with Log4J 2 calls. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ce47719a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ce47719a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ce47719a Branch: refs/heads/feature-autobuild/cleanup Commit: ce47719a48b020d8dd1a03c473359fc8d61b1f3d Parents: d277641 Author: Christofer Dutz Authored: Sun Dec 25 20:54:56 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 25 20:54:56 2016 +0100 -- pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ce47719a/pom.xml -- diff --git a/pom.xml b/pom.xml index 67695d2..0afee43 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,8 @@ This build builds only the framework libraries per default. - In order to build the examples, activate the "build-examples" profile - In order to assemble a distribution, activate the "build-distribution" profile. + +Dummy change -->
[flex-typedefs] Git Push Summary
Repository: flex-typedefs Updated Branches: refs/heads/faeture-autobuild/cleanup [created] 1b46e4097
[flex-asjs] Git Push Summary
Repository: flex-asjs Updated Branches: refs/heads/feature-autobuild/cleanup [created] d277641ed
[2/2] git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - - Replaced System.out.print(ln) and System.err.print(ln) statements with Log4J 2 calls.
- Replaced System.out.print(ln) and System.err.print(ln) statements with Log4J 2 calls. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/87ad72a6 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/87ad72a6 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/87ad72a6 Branch: refs/heads/feature-autobuild/cleanup Commit: 87ad72a6d69ae8f2aff1a84391c7d916a0c887a0 Parents: 7926477 Author: Christofer Dutz Authored: Sun Dec 25 20:42:22 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 25 20:42:22 2016 +0100 -- .../apache/flex/compiler/clients/ASDOCJSC.java | 9 +- .../apache/flex/compiler/clients/COMPJSC.java | 15 ++-- .../apache/flex/compiler/clients/EXTERNC.java | 7 +- .../apache/flex/compiler/clients/MXMLJSC.java | 11 ++- .../internal/codegen/as/ASBlockWalker.java | 8 +- .../compiler/internal/codegen/as/ASWriter.java | 7 +- .../externals/reference/MethodReference.java| 6 +- .../codegen/externals/utils/DebugLogUtils.java | 13 ++- .../codegen/externals/utils/FunctionUtils.java | 57 ++-- .../internal/codegen/js/JSPublisher.java| 13 +-- .../js/flexjs/JSFlexJSASDocDITAEmitter.java | 55 ++-- .../codegen/js/flexjs/JSFlexJSASDocEmitter.java | 70 +++ .../codegen/js/flexjs/JSFlexJSDocEmitter.java | 20 +++-- .../codegen/js/flexjs/JSFlexJSEmitter.java | 35 .../codegen/js/goog/JSGoogPublisher.java| 7 +- .../codegen/js/utils/DocEmitterUtils.java | 7 +- .../internal/codegen/mxml/MXMLWriter.java | 8 +- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 58 ++-- .../mxml/flexjs/MXMLFlexJSPublisher.java| 8 +- .../compiler/internal/graph/GoogDepsWriter.java | 95 +--- .../utils/JSClosureCompilerWrapper.java | 8 +- .../codegen/externals/TestExternChrome.java | 21 +++-- .../externals/TestExternalsJSCompile.java | 10 ++- .../flex/compiler/internal/test/TestBase.java | 23 ++--- .../org/apache/flex/utils/EnvProperties.java| 42 + compiler-test-utils/pom.xml | 10 +++ .../org/apache/flex/utils/EnvProperties.java| 49 +- compiler/pom.xml| 10 +++ .../org/apache/flex/compiler/clients/ASC.java | 4 + .../org/apache/flex/compiler/clients/ASDOC.java | 10 ++- .../org/apache/flex/compiler/clients/COMPC.java | 10 ++- .../org/apache/flex/compiler/clients/MXMLC.java | 90 +-- .../apache/flex/compiler/clients/Optimizer.java | 19 ++-- .../flex/compiler/config/Configurator.java | 8 +- .../internal/as/codegen/DumpBURMState.java | 10 ++- .../databinding/BindingCodeGenUtils.java| 11 ++- .../codegen/databinding/BindingInfo.java| 7 +- .../databinding/MXMLBindingDirectiveHelper.java | 70 --- .../codegen/databinding/WatcherAnalyzer.java| 7 +- .../flex/compiler/internal/common/Counter.java | 9 +- .../internal/config/FileConfigurator.java | 7 +- .../config/FlashBuilderConfigurator.java| 16 ++-- .../internal/fxg/logging/SystemLogger.java | 6 ++ .../flex/compiler/internal/mxml/MXMLData.java | 7 +- .../internal/mxml/MXMLManifestManager.java | 9 +- .../internal/parsing/mxml/MXMLTokenizer.java| 7 +- .../compiler/internal/targets/SWFTarget.java| 8 +- .../tree/mxml/MXMLClassDefinitionNode.java | 9 +- .../java/org/apache/flex/swc/SWCDepends.java| 14 +-- .../java/org/apache/flex/swf/io/SWFDump.java| 28 +++--- .../main/java/org/apache/flex/utils/Base64.java | 15 +++- .../main/java/org/apache/flex/utils/Trace.java | 37 +--- compiler/src/main/resources/log4j2.xml | 31 +++ .../src/test/java/as/ASFeatureTestsBase.java| 15 ++-- .../java/mxml/tags/MXMLFeatureTestsBase.java| 11 ++- .../internal/tree/mxml/MXMLNodeBaseTests.java | 9 +- .../java/utils/FlashplayerSecurityHandler.java | 13 ++- 57 files changed, 729 insertions(+), 450 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java -- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java index a74c7d8..c279fa5 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java @@ -53,6 +53,8 @@ import org.apache.flex.compiler.problems.UnableToBuildSWFProblem; import org.apache.flex.compiler.targets.ITarget.TargetType; import org.apache.flex.compiler.targets.ITargetSettings; import
[1/2] git commit: [flex-falcon] [refs/heads/feature-autobuild/cleanup] - - Replaced System.out.print(ln) and System.err.print(ln) statements with Log4J 2 calls.
Repository: flex-falcon
Updated Branches:
refs/heads/feature-autobuild/cleanup [created] 87ad72a6d
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler/pom.xml
--
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 985622e..c34c7e0 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -410,6 +410,16 @@
lzma-sdk-4j
9.22.0
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.7
+
+
+ org.apache.logging.log4j
+ log4j-core
+ 2.7
+
org.apache.flex.flexjs.compiler
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
--
diff --git a/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
b/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
index f8c9cd4..4b88b4f 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/clients/ASC.java
@@ -103,6 +103,8 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.common.collect.Sets.SetView;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* ActionScript Compiler command-line interface.
@@ -115,6 +117,8 @@ import com.google.common.collect.Sets.SetView;
public class ASC
{
+private static final Logger logger = LogManager.getLogger(ASC.class);
+
private static final String DOUBLE_QUOTE = "\"";
/**
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler/src/main/java/org/apache/flex/compiler/clients/ASDOC.java
--
diff --git a/compiler/src/main/java/org/apache/flex/compiler/clients/ASDOC.java
b/compiler/src/main/java/org/apache/flex/compiler/clients/ASDOC.java
index dadfbf7..861f979 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/clients/ASDOC.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/clients/ASDOC.java
@@ -46,6 +46,8 @@ import org.apache.flex.swc.io.SWCWriter;
import org.apache.flex.swf.io.SizeReportWritingSWFWriter;
import org.apache.flex.tools.FlexTool;
import org.apache.flex.utils.FilenameNormalization;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Documentation compiler entry point.
@@ -55,6 +57,9 @@ import org.apache.flex.utils.FilenameNormalization;
*/
public class ASDOC extends MXMLC implements FlexTool
{
+
+private static final Logger logger = LogManager.getLogger(ASDOC.class);
+
/**
* Entry point for compc tool.
*
@@ -205,8 +210,9 @@ public class ASDOC extends MXMLC implements FlexTool
@Override
protected void reportTargetCompletion()
{
-if (asdocOutputMessage != null)
-println(asdocOutputMessage);
+if (asdocOutputMessage != null) {
+logger.info(asdocOutputMessage);
+}
}
/**
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java
--
diff --git a/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java
b/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java
index 547f40f..857f3fc 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/clients/COMPC.java
@@ -45,6 +45,8 @@ import org.apache.flex.swc.io.SWCWriter;
import org.apache.flex.swf.io.SizeReportWritingSWFWriter;
import org.apache.flex.tools.FlexTool;
import org.apache.flex.utils.FilenameNormalization;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Component compiler entry point.
@@ -54,6 +56,9 @@ import org.apache.flex.utils.FilenameNormalization;
*/
public class COMPC extends MXMLC implements FlexTool
{
+
+private static final Logger logger = LogManager.getLogger(COMPC.class);
+
/**
* Entry point for compc tool.
*
@@ -199,8 +204,9 @@ public class COMPC extends MXMLC implements FlexTool
@Override
protected void reportTargetCompletion()
{
-if (swcOutputMessage != null)
-println(swcOutputMessage);
+if (swcOutputMessage != null) {
+logger.info(swcOutputMessage);
+}
}
/**
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/87ad72a6/compiler/src/main/java/org/apache/flex/compiler/clients/MXMLC.java
--
diff --git a/compiler/src/main/java/org/apache/flex/compiler/clients/MXMLC.java
b/compiler/src/main/java/or
git commit: [flex-falcon] [refs/heads/develop] - FLEX-35228 - [FlexJS] Usage of statics in JSSharedData causes problems - Fixed some problems in unit-tests
Repository: flex-falcon
Updated Branches:
refs/heads/develop 319cb536e -> 79264773d
FLEX-35228 - [FlexJS] Usage of statics in JSSharedData causes problems
- Fixed some problems in unit-tests
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/79264773
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/79264773
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/79264773
Branch: refs/heads/develop
Commit: 79264773d6e7fea64a792fbef45802e115de5631
Parents: 319cb53
Author: Christofer Dutz
Authored: Sun Dec 25 17:59:10 2016 +0100
Committer: Christofer Dutz
Committed: Sun Dec 25 17:59:10 2016 +0100
--
.../flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java | 3 ++-
.../compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java| 3 ++-
.../internal/codegen/js/flexjs/TestFlexJSExpressions.java | 3 ++-
.../internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java | 1 +
.../internal/codegen/js/flexjs/TestFlexJSGlobalFunctions.java | 3 ++-
.../compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java| 3 ++-
.../compiler/internal/codegen/js/flexjs/TestFlexJSStatements.java | 3 ++-
7 files changed, 13 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79264773/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
index c828aa7..1bb287b 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSClass.java
@@ -35,7 +35,8 @@ public class TestFlexJSClass extends TestGoogClass
@Override
public void setUp()
{
- project = new FlexJSProject(workspace, backend);
+backend = createBackend();
+project = new FlexJSProject(workspace, backend);
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79264773/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
index 6efd5b4..62d5265 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmitter.java
@@ -37,7 +37,8 @@ public class TestFlexJSEmitter extends TestGoogEmitter
@Override
public void setUp()
{
-project = new FlexJSProject(workspace, backend);
+ backend = createBackend();
+ project = new FlexJSProject(workspace, backend);
super.setUp();
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79264773/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
index 3a58690..b50636f 100644
---
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
+++
b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
@@ -49,7 +49,8 @@ public class TestFlexJSExpressions extends TestGoogExpressions
@Override
public void setUp()
{
- project = new FlexJSProject(workspace, backend);
+backend = createBackend();
+project = new FlexJSProject(workspace, backend);
workspace.setASDocDelegate(new FlexJSASDocDelegate());
JSGoogConfiguration config = new JSGoogConfiguration();
try {
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/79264773/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
--
diff --git
a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSGlobalClasses.java
b/compiler-jx/src/test/java/org/apache/
[2/3] git commit: [flex-falcon] [refs/heads/develop] - FLEX-35228 - [FlexJS] Usage of statics in JSSharedData causes problems - Moved the static properties into the FlexJSProject class - Refactored th
FLEX-35228 - [FlexJS] Usage of statics in JSSharedData causes problems - Moved the static properties into the FlexJSProject class - Refactored the compiler to utilize FlexJSProject instead of IASProject (Was cast to FlexJSProject in a lot of places anyway) Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/22ea48e6 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/22ea48e6 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/22ea48e6 Branch: refs/heads/develop Commit: 22ea48e6d2c644ddee5c50f4fc9eec31029b3065 Parents: 20a1b31 Author: Christofer Dutz Authored: Sun Dec 25 16:55:15 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 25 16:55:15 2016 +0100 -- .../apache/flex/compiler/clients/ASDOCJSC.java | 17 .../apache/flex/compiler/clients/COMPJSC.java | 17 .../flex/compiler/clients/FlexJSToolGroup.java | 2 + .../apache/flex/compiler/clients/MXMLJSC.java | 44 +--- .../apache/flex/compiler/driver/IBackend.java | 25 ++- .../compiler/internal/codegen/as/ASWriter.java | 17 .../internal/codegen/js/JSPublisher.java| 7 +++- .../internal/codegen/js/JSSharedData.java | 36 ++-- .../compiler/internal/codegen/js/JSWriter.java | 12 +++--- .../codegen/js/goog/JSGoogDocEmitter.java | 22 +- .../codegen/js/goog/JSGoogPublisher.java| 8 ++-- .../internal/codegen/js/jsc/JSCPublisher.java | 4 +- .../internal/codegen/js/node/NodePublisher.java | 2 +- .../internal/codegen/mxml/MXMLWriter.java | 9 ++-- .../mxml/flexjs/MXMLFlexJSPublisher.java| 7 ++-- .../compiler/internal/driver/as/ASBackend.java | 18 .../compiler/internal/driver/js/JSBackend.java | 20 - .../driver/js/flexjs/FlexJSBackend.java | 6 +-- .../internal/driver/js/goog/GoogBackend.java| 6 +-- .../internal/driver/js/jsc/JSCBackend.java | 5 +-- .../internal/driver/js/node/NodeBackend.java| 5 +-- .../driver/mxml/ASDocASSourceFileHandler.java | 4 +- .../internal/driver/mxml/MXMLBackend.java | 4 +- .../mxml/flexjs/MXMLFlexJSASDocBackend.java | 8 ++-- .../mxml/flexjs/MXMLFlexJSASDocDITABackend.java | 9 ++-- .../driver/mxml/flexjs/MXMLFlexJSBackend.java | 11 +++-- .../mxml/flexjs/MXMLFlexJSSWCBackend.java | 8 ++-- .../driver/mxml/jsc/MXMLJSCJSBackend.java | 8 ++-- .../driver/mxml/jsc/MXMLJSCJSSWCBackend.java| 8 ++-- .../internal/projects/FlexJSASDocProject.java | 6 ++- .../internal/projects/FlexJSProject.java| 11 - .../internal/targets/FlexJSSWCTarget.java | 2 +- .../compiler/internal/targets/FlexJSTarget.java | 5 +-- .../compiler/internal/targets/JSTarget.java | 14 +++ .../externals/TestExternalsJSCompile.java | 4 +- .../codegen/js/flexjs/TestFlexJSClass.java | 2 +- .../codegen/js/flexjs/TestFlexJSEmitter.java| 2 +- .../js/flexjs/TestFlexJSExpressions.java| 2 +- .../js/flexjs/TestFlexJSGlobalClasses.java | 4 +- .../js/flexjs/TestFlexJSGlobalFunctions.java| 4 +- .../codegen/js/flexjs/TestFlexJSPackage.java| 2 +- .../codegen/js/flexjs/TestFlexJSProject.java| 4 +- .../codegen/js/flexjs/TestFlexJSStatements.java | 2 +- .../compiler/internal/test/FlexJSTestBase.java | 2 +- .../flex/compiler/internal/test/TestBase.java | 12 +++--- 45 files changed, 216 insertions(+), 211 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/22ea48e6/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java -- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java index cafd5c6..a74c7d8 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/ASDOCJSC.java @@ -36,7 +36,6 @@ import org.apache.flex.compiler.driver.js.IJSApplication; import org.apache.flex.compiler.exceptions.ConfigurationException; import org.apache.flex.compiler.exceptions.ConfigurationException.IOError; import org.apache.flex.compiler.exceptions.ConfigurationException.MustSpecifyTarget; -import org.apache.flex.compiler.internal.codegen.js.JSSharedData; import org.apache.flex.compiler.internal.driver.as.ASBackend; import org.apache.flex.compiler.internal.driver.js.amd.AMDBackend; import org.apache.flex.compiler.internal.driver.js.goog.ASDocConfiguration; @@ -154,7 +153,7 @@ public class ASDOCJSC extends MXMLJSC final int exitCode = mxmlc.mainNoExit(args, problems, true); long endTime = System.nanoTime(); -JSSharedData.ins
[2/2] git commit: [flex-asjs] [refs/heads/develop] - - Added ListExample and DateControlsExample to the Maven build - Fixed issues with the DateControlsExample Maven configuration
- Added ListExample and DateControlsExample to the Maven build - Fixed issues with the DateControlsExample Maven configuration Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d277641e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d277641e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d277641e Branch: refs/heads/develop Commit: d277641ed7141f48d599a0e96fe22b62980b2a05 Parents: 523577f Author: Christofer Dutz Authored: Sun Dec 25 17:16:24 2016 +0100 Committer: Christofer Dutz Committed: Sun Dec 25 17:16:24 2016 +0100 -- examples/flexjs/DateControlsExample/pom.xml | 12 +--- examples/flexjs/pom.xml | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d277641e/examples/flexjs/DateControlsExample/pom.xml -- diff --git a/examples/flexjs/DateControlsExample/pom.xml b/examples/flexjs/DateControlsExample/pom.xml index b65b0f0..2883693 100644 --- a/examples/flexjs/DateControlsExample/pom.xml +++ b/examples/flexjs/DateControlsExample/pom.xml @@ -32,11 +32,11 @@ 0.8.0-SNAPSHOT - DataGridExample + DateControlsExample 0.8.0-SNAPSHOT swf - Apache Flex - FlexJS: Examples: FlexJS: DataGridExample + Apache Flex - FlexJS: Examples: FlexJS: DateControlsExample @@ -45,7 +45,7 @@ flexjs-maven-plugin true - DataGridExample.mxml + DateControlsExample.mxml @@ -67,6 +67,12 @@ swc provided + + org.apache.flex.flexjs.framework + Formatters + 0.8.0-SNAPSHOT + swc + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d277641e/examples/flexjs/pom.xml -- diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml index aa1bb87..8bb59d5 100644 --- a/examples/flexjs/pom.xml +++ b/examples/flexjs/pom.xml @@ -43,11 +43,13 @@ DataBindingExample_as DataBindingExample_Flat DataGridExample +DateControlsExample DesktopMap FlexJSStore FlexJSStore_jquery FlexWebsiteStatsViewer HelloWorld +ListExample MapSearch MDLExample MobileMap
