flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [35/51] [partial] FLEX-34306 - [BlazeDS] Make the BlazeDS build run on Windows machines - Added some mkdir commands to the ANT Build.java - Did some fine-tuning to resolve some compile errors
Date Mon, 05 May 2014 20:08:49 GMT
http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java b/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java
old mode 100755
new mode 100644
index 7cdbb74..de4db0f
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControl.java
@@ -1,72 +1,72 @@
-/*
- * 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.endpoints;
-
-import flex.management.BaseControl;
-import flex.management.runtime.AdminConsoleTypes;
-import flex.messaging.endpoints.BasePollingHTTPEndpoint;
-
-/**
- * The <tt>PollingEndpointControl</tt> class is the base MBean implementation
- * for monitoring and managing a <tt>BasePollingHTTPEndpoint</tt> at runtime.
- */
-public abstract class PollingEndpointControl extends EndpointControl implements
-        PollingEndpointControlMBean
-{
-    /**
-     * Constructs a <tt>PollingEndpointControl</tt>, assigning managed message
-     * endpoint and parent MBean.
-     *
-     * @param endpoint The <code>BasePollingHTTPEndpoint</code> managed by this MBean.
-     * @param parent The parent MBean in the management hierarchy.
-     */
-    public PollingEndpointControl(BasePollingHTTPEndpoint endpoint, BaseControl parent)
-    {
-        super(endpoint, parent);
-    }
-
-    protected void onRegistrationComplete()
-    {
-        super.onRegistrationComplete();
-
-        String name = this.getObjectName().getCanonicalName();
-        String[] generalPollables = {"WaitingPollRequestsCount"};
-
-        getRegistrar().registerObjects(AdminConsoleTypes.ENDPOINT_POLLABLE, name, generalPollables);
-        getRegistrar().registerObject(AdminConsoleTypes.ENDPOINT_SCALAR, name, "MaxWaitingPollRequests");
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see flex.management.runtime.messaging.endpoints.PollingEndpointControlMBean#getMaxWaitingPollRequests()
-     */
-    public Integer getMaxWaitingPollRequests()
-    {
-        int maxWaitingPollRequests = ((BasePollingHTTPEndpoint)endpoint).getMaxWaitingPollRequests();
-        return new Integer(maxWaitingPollRequests);
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see flex.management.runtime.messaging.endpoints.PollingEndpointControlMBean#getWaitingPollRequestsCount()
-     */
-    public Integer getWaitingPollRequestsCount()
-    {
-        int waitingPollRequestsCount = ((BasePollingHTTPEndpoint)endpoint).getWaitingPollRequestsCount();
-        return new Integer(waitingPollRequestsCount);
-    }
-}
+/*
+ * 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.endpoints;
+
+import flex.management.BaseControl;
+import flex.management.runtime.AdminConsoleTypes;
+import flex.messaging.endpoints.BasePollingHTTPEndpoint;
+
+/**
+ * The <tt>PollingEndpointControl</tt> class is the base MBean implementation
+ * for monitoring and managing a <tt>BasePollingHTTPEndpoint</tt> at runtime.
+ */
+public abstract class PollingEndpointControl extends EndpointControl implements
+        PollingEndpointControlMBean
+{
+    /**
+     * Constructs a <tt>PollingEndpointControl</tt>, assigning managed message
+     * endpoint and parent MBean.
+     *
+     * @param endpoint The <code>BasePollingHTTPEndpoint</code> managed by this MBean.
+     * @param parent The parent MBean in the management hierarchy.
+     */
+    public PollingEndpointControl(BasePollingHTTPEndpoint endpoint, BaseControl parent)
+    {
+        super(endpoint, parent);
+    }
+
+    protected void onRegistrationComplete()
+    {
+        super.onRegistrationComplete();
+
+        String name = this.getObjectName().getCanonicalName();
+        String[] generalPollables = {"WaitingPollRequestsCount"};
+
+        getRegistrar().registerObjects(AdminConsoleTypes.ENDPOINT_POLLABLE, name, generalPollables);
+        getRegistrar().registerObject(AdminConsoleTypes.ENDPOINT_SCALAR, name, "MaxWaitingPollRequests");
+    }
+
+    /*
+     *  (non-Javadoc)
+     * @see flex.management.runtime.messaging.endpoints.PollingEndpointControlMBean#getMaxWaitingPollRequests()
+     */
+    public Integer getMaxWaitingPollRequests()
+    {
+        int maxWaitingPollRequests = ((BasePollingHTTPEndpoint)endpoint).getMaxWaitingPollRequests();
+        return new Integer(maxWaitingPollRequests);
+    }
+
+    /*
+     *  (non-Javadoc)
+     * @see flex.management.runtime.messaging.endpoints.PollingEndpointControlMBean#getWaitingPollRequestsCount()
+     */
+    public Integer getWaitingPollRequestsCount()
+    {
+        int waitingPollRequestsCount = ((BasePollingHTTPEndpoint)endpoint).getWaitingPollRequestsCount();
+        return new Integer(waitingPollRequestsCount);
+    }
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java b/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java
old mode 100755
new mode 100644
index 016b276..2c30b49
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/PollingEndpointControlMBean.java
@@ -1,45 +1,45 @@
-/*
- * 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.endpoints;
-
-import java.io.IOException;
-
-/**
- * Defines the runtime monitoring and management interface for managed polling
- * endpoints.
- */
-public interface PollingEndpointControlMBean extends EndpointControlMBean
-{
-    /**
-     * Returns the maximum number of server poll response threads that will be
-     * waiting for messages to arrive for clients.
-     *
-     * @return The maximum number of server poll response threads that will be
-     * waiting for messages to arrive for clients.
-     * @throws IOException Throws IOException.
-     */
-    Integer getMaxWaitingPollRequests() throws IOException;
-
-    /**
-     * Returns the number of request threads that are currently in the wait state
-     * (including those on their way into or out of it).
-     *
-     * @return The number of request threads that are currently in the wait state.
-     * @throws IOException Throws IOException.
-     */
-    Integer getWaitingPollRequestsCount() throws IOException;
-}
+/*
+ * 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.endpoints;
+
+import java.io.IOException;
+
+/**
+ * Defines the runtime monitoring and management interface for managed polling
+ * endpoints.
+ */
+public interface PollingEndpointControlMBean extends EndpointControlMBean
+{
+    /**
+     * Returns the maximum number of server poll response threads that will be
+     * waiting for messages to arrive for clients.
+     *
+     * @return The maximum number of server poll response threads that will be
+     * waiting for messages to arrive for clients.
+     * @throws IOException Throws IOException.
+     */
+    Integer getMaxWaitingPollRequests() throws IOException;
+
+    /**
+     * Returns the number of request threads that are currently in the wait state
+     * (including those on their way into or out of it).
+     *
+     * @return The number of request threads that are currently in the wait state.
+     * @throws IOException Throws IOException.
+     */
+    Integer getWaitingPollRequestsCount() throws IOException;
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java
old mode 100755
new mode 100644
index 15b29bc..00d7022
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControl.java
@@ -1,48 +1,48 @@
-/*
- * 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.endpoints;
-
-import flex.management.BaseControl;
-import flex.messaging.endpoints.StreamingAMFEndpoint;
-
-/**
- * The <code>StreamingAMFEndpointControl</code> class is the MBean implemenation
- * for monitoring and managing an <code>StreamingAMFEndpoint</code> at runtime.
- */
-public class StreamingAMFEndpointControl extends StreamingEndpointControl implements
-        StreamingAMFEndpointControlMBean
-{
-    private static final String TYPE = "StreamingAMFEndpoint";
-
-    /**
-     * Constructs a <code>StreamingAMFEndpointControl</code>, assigning managed message
-     * endpoint and parent MBean.
-     *
-     * @param endpoint The <code>StreamingAMFEndpoint</code> managed by this MBean.
-     * @param parent The parent MBean in the management hierarchy.
-     */
-    public StreamingAMFEndpointControl(StreamingAMFEndpoint endpoint, BaseControl parent)
-    {
-        super(endpoint, parent);
-    }
-
-    /** {@inheritDoc} */
-    public String getType()
-    {
-        return TYPE;
-    }
-}
+/*
+ * 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.endpoints;
+
+import flex.management.BaseControl;
+import flex.messaging.endpoints.StreamingAMFEndpoint;
+
+/**
+ * The <code>StreamingAMFEndpointControl</code> class is the MBean implemenation
+ * for monitoring and managing an <code>StreamingAMFEndpoint</code> at runtime.
+ */
+public class StreamingAMFEndpointControl extends StreamingEndpointControl implements
+        StreamingAMFEndpointControlMBean
+{
+    private static final String TYPE = "StreamingAMFEndpoint";
+
+    /**
+     * Constructs a <code>StreamingAMFEndpointControl</code>, assigning managed message
+     * endpoint and parent MBean.
+     *
+     * @param endpoint The <code>StreamingAMFEndpoint</code> managed by this MBean.
+     * @param parent The parent MBean in the management hierarchy.
+     */
+    public StreamingAMFEndpointControl(StreamingAMFEndpoint endpoint, BaseControl parent)
+    {
+        super(endpoint, parent);
+    }
+
+    /** {@inheritDoc} */
+    public String getType()
+    {
+        return TYPE;
+    }
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java
old mode 100755
new mode 100644
index fffa29b..32d05b9
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingAMFEndpointControlMBean.java
@@ -1,26 +1,26 @@
-/*
- * 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.endpoints;
-
-/**
- * Defines the runtime monitoring and management interface for managed streaming 
- * AMF endpoints.
- */
-public interface StreamingAMFEndpointControlMBean extends StreamingEndpointControlMBean
-{
-    // Empty for now
-}
+/*
+ * 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.endpoints;
+
+/**
+ * Defines the runtime monitoring and management interface for managed streaming 
+ * AMF endpoints.
+ */
+public interface StreamingAMFEndpointControlMBean extends StreamingEndpointControlMBean
+{
+    // Empty for now
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java
old mode 100755
new mode 100644
index 1d50bb8..b3cdc64
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControl.java
@@ -1,133 +1,133 @@
-/*
- * 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.endpoints;
-
-import java.util.Date;
-
-import flex.management.BaseControl;
-import flex.management.runtime.AdminConsoleTypes;
-import flex.messaging.endpoints.BaseStreamingHTTPEndpoint;
-
-/**
- * The <code>StreamingEndpointControl</code> class is the base MBean implementation
- * for monitoring and managing a <code>BaseStreamingHTTPEndpoint</code> at runtime.
- */
-public abstract class StreamingEndpointControl extends EndpointControl implements
-        StreamingEndpointControlMBean
-{   
-    private int pushCount;
-    private Date lastPushTimeStamp;
-    private long pushStart;
-    
-    /**
-     * Constructs a <code>StreamingEndpointControl</code>, assigning managed message 
-     * endpoint and parent MBean.
-     * 
-     * @param endpoint The <code>BaseStreamingHTTPEndpoint</code> managed by this MBean.
-     * @param parent The parent MBean in the management hierarchy.
-     */
-    public StreamingEndpointControl(BaseStreamingHTTPEndpoint endpoint, BaseControl parent)
-    {
-        super(endpoint, parent);
-    }
-        
-    protected void onRegistrationComplete()
-    {
-        super.onRegistrationComplete();
-        
-        String name = this.getObjectName().getCanonicalName();
-        String[] generalPollables = { "LastPushTimestamp", "PushCount", "PushFrequency", "StreamingClientsCount"};
-        
-        getRegistrar().registerObjects(AdminConsoleTypes.ENDPOINT_POLLABLE, name, generalPollables);
-        getRegistrar().registerObject(AdminConsoleTypes.ENDPOINT_SCALAR, name, "MaxStreamingClients");
-    }
-    
-    /*
-     *  (non-Javadoc)
-     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#getMaxStreamingClients()
-     */
-    public Integer getMaxStreamingClients() 
-    {
-        int maxStreamingClientsCount = ((BaseStreamingHTTPEndpoint)endpoint).getMaxStreamingClients();
-        return new Integer(maxStreamingClientsCount);
-    }
-
-    /*
-     *  (non-Javadoc)
-     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#getPushCount()
-     */
-    public Integer getPushCount()
-    {
-        return new Integer(pushCount);
-    }
-    
-    /*
-     *  (non-Javadoc)
-     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#resetPushCount()
-     */
-    public void resetPushCount()
-    {
-        pushStart = System.currentTimeMillis();
-        pushCount = 0;
-        lastPushTimeStamp = null;
-    }
-    
-    /**
-     * Increments the count of messages pushed by the endpoint.
-     */
-    public void incrementPushCount()
-    {
-        ++pushCount;
-        lastPushTimeStamp = new Date();
-    }    
-    
-    /*
-     *  (non-Javadoc)
-     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#getLastPushTimestamp()
-     */
-    public Date getLastPushTimestamp()
-    {
-        return lastPushTimeStamp;
-    }
-    
-    /*
-     *  (non-Javadoc)
-     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#getPushFrequency()
-     */
-    public Double getPushFrequency()
-    {
-        if (pushCount > 0)
-        {
-            double runtime = differenceInMinutes(pushStart, System.currentTimeMillis());
-            return new Double(pushCount/runtime);
-        }
-        else
-        {
-            return new Double(0);
-        }
-    }
-    
-    /*
-     *  (non-Javadoc)
-     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#isRunning()
-     */
-    public Integer getStreamingClientsCount()
-    {
-        int streamingClientsCount = ((BaseStreamingHTTPEndpoint)endpoint).getStreamingClientsCount();
-        return new Integer(streamingClientsCount);
-    }
-}
+/*
+ * 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.endpoints;
+
+import java.util.Date;
+
+import flex.management.BaseControl;
+import flex.management.runtime.AdminConsoleTypes;
+import flex.messaging.endpoints.BaseStreamingHTTPEndpoint;
+
+/**
+ * The <code>StreamingEndpointControl</code> class is the base MBean implementation
+ * for monitoring and managing a <code>BaseStreamingHTTPEndpoint</code> at runtime.
+ */
+public abstract class StreamingEndpointControl extends EndpointControl implements
+        StreamingEndpointControlMBean
+{   
+    private int pushCount;
+    private Date lastPushTimeStamp;
+    private long pushStart;
+    
+    /**
+     * Constructs a <code>StreamingEndpointControl</code>, assigning managed message 
+     * endpoint and parent MBean.
+     * 
+     * @param endpoint The <code>BaseStreamingHTTPEndpoint</code> managed by this MBean.
+     * @param parent The parent MBean in the management hierarchy.
+     */
+    public StreamingEndpointControl(BaseStreamingHTTPEndpoint endpoint, BaseControl parent)
+    {
+        super(endpoint, parent);
+    }
+        
+    protected void onRegistrationComplete()
+    {
+        super.onRegistrationComplete();
+        
+        String name = this.getObjectName().getCanonicalName();
+        String[] generalPollables = { "LastPushTimestamp", "PushCount", "PushFrequency", "StreamingClientsCount"};
+        
+        getRegistrar().registerObjects(AdminConsoleTypes.ENDPOINT_POLLABLE, name, generalPollables);
+        getRegistrar().registerObject(AdminConsoleTypes.ENDPOINT_SCALAR, name, "MaxStreamingClients");
+    }
+    
+    /*
+     *  (non-Javadoc)
+     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#getMaxStreamingClients()
+     */
+    public Integer getMaxStreamingClients() 
+    {
+        int maxStreamingClientsCount = ((BaseStreamingHTTPEndpoint)endpoint).getMaxStreamingClients();
+        return new Integer(maxStreamingClientsCount);
+    }
+
+    /*
+     *  (non-Javadoc)
+     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#getPushCount()
+     */
+    public Integer getPushCount()
+    {
+        return new Integer(pushCount);
+    }
+    
+    /*
+     *  (non-Javadoc)
+     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#resetPushCount()
+     */
+    public void resetPushCount()
+    {
+        pushStart = System.currentTimeMillis();
+        pushCount = 0;
+        lastPushTimeStamp = null;
+    }
+    
+    /**
+     * Increments the count of messages pushed by the endpoint.
+     */
+    public void incrementPushCount()
+    {
+        ++pushCount;
+        lastPushTimeStamp = new Date();
+    }    
+    
+    /*
+     *  (non-Javadoc)
+     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#getLastPushTimestamp()
+     */
+    public Date getLastPushTimestamp()
+    {
+        return lastPushTimeStamp;
+    }
+    
+    /*
+     *  (non-Javadoc)
+     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#getPushFrequency()
+     */
+    public Double getPushFrequency()
+    {
+        if (pushCount > 0)
+        {
+            double runtime = differenceInMinutes(pushStart, System.currentTimeMillis());
+            return new Double(pushCount/runtime);
+        }
+        else
+        {
+            return new Double(0);
+        }
+    }
+    
+    /*
+     *  (non-Javadoc)
+     * @see flex.management.runtime.messaging.endpoints.StreamingEndpointControlMBean#isRunning()
+     */
+    public Integer getStreamingClientsCount()
+    {
+        int streamingClientsCount = ((BaseStreamingHTTPEndpoint)endpoint).getStreamingClientsCount();
+        return new Integer(streamingClientsCount);
+    }
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java
old mode 100755
new mode 100644
index 69c6409..b8c684e
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingEndpointControlMBean.java
@@ -1,76 +1,76 @@
-/*
- * 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.endpoints;
-
-import java.io.IOException;
-import java.util.Date;
-
-/**
- * Defines the runtime monitoring and management interface for managed streaming
- * endpoints.
- */
-public interface StreamingEndpointControlMBean extends EndpointControlMBean
-{
-    /**
-     * Returns the maximum number of clients that will be allowed to establish
-     * a streaming HTTP connection with the endpoint.
-     *
-     * @return The maximum number of clients that will be allowed to establish
-     * a streaming HTTP connection with the endpoint.
-     * @throws IOException Throws IOException.
-     */
-    Integer getMaxStreamingClients() throws IOException;
-
-    /**
-     * Returns the count of push invocations.
-     *
-     * @return The count of push invocations.
-     * @throws IOException Throws IOException.
-     */
-    Integer getPushCount() throws IOException;
-
-    /**
-     * Resets the count of push invocations.
-     *
-     * @throws IOException Throws IOException.
-     */
-    void resetPushCount() throws IOException;
-
-    /**
-     * Returns the timestamp for the most recent push invocation.
-     *
-     * @return The timestamp for the most recent push invocation.
-     * @throws IOException Throws IOException.
-     */
-    Date getLastPushTimestamp() throws IOException;
-
-    /**
-     * Returns the number of push invocations per minute.
-     *
-     * @return The number of push invocations per minute.
-     * @throws IOException Throws IOException.
-     */
-    Double getPushFrequency() throws IOException;
-
-    /**
-     * Returns the the number of clients that are currently in the streaming state.
-     *
-     * @return The number of clients that are currently in the streaming state.
-     * @throws IOException Throws IOException.
-     */
-    Integer getStreamingClientsCount() throws IOException;
-}
+/*
+ * 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.endpoints;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * Defines the runtime monitoring and management interface for managed streaming
+ * endpoints.
+ */
+public interface StreamingEndpointControlMBean extends EndpointControlMBean
+{
+    /**
+     * Returns the maximum number of clients that will be allowed to establish
+     * a streaming HTTP connection with the endpoint.
+     *
+     * @return The maximum number of clients that will be allowed to establish
+     * a streaming HTTP connection with the endpoint.
+     * @throws IOException Throws IOException.
+     */
+    Integer getMaxStreamingClients() throws IOException;
+
+    /**
+     * Returns the count of push invocations.
+     *
+     * @return The count of push invocations.
+     * @throws IOException Throws IOException.
+     */
+    Integer getPushCount() throws IOException;
+
+    /**
+     * Resets the count of push invocations.
+     *
+     * @throws IOException Throws IOException.
+     */
+    void resetPushCount() throws IOException;
+
+    /**
+     * Returns the timestamp for the most recent push invocation.
+     *
+     * @return The timestamp for the most recent push invocation.
+     * @throws IOException Throws IOException.
+     */
+    Date getLastPushTimestamp() throws IOException;
+
+    /**
+     * Returns the number of push invocations per minute.
+     *
+     * @return The number of push invocations per minute.
+     * @throws IOException Throws IOException.
+     */
+    Double getPushFrequency() throws IOException;
+
+    /**
+     * Returns the the number of clients that are currently in the streaming state.
+     *
+     * @return The number of clients that are currently in the streaming state.
+     * @throws IOException Throws IOException.
+     */
+    Integer getStreamingClientsCount() throws IOException;
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java
old mode 100755
new mode 100644
index 1ce6d5d..a103b95
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControl.java
@@ -1,48 +1,48 @@
-/*
- * 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.endpoints;
-
-import flex.management.BaseControl;
-import flex.messaging.endpoints.StreamingHTTPEndpoint;
-
-/**
- * The <code>StreamingHTTPEndpointControl</code> class is the MBean implemenation
- * for monitoring and managing a <code>StreamingHTTPEndpoint</code> at runtime.
- */
-public class StreamingHTTPEndpointControl extends StreamingEndpointControl implements
-    StreamingHTTPEndpointControlMBean
-{
-    private static final String TYPE = "StreamingHTTPEndpoint";
-
-    /**
-     * Constructs a <code>StreamingHTTPEndpointControl</code>, assigning managed message
-     * endpoint and parent MBean.
-     *
-     * @param endpoint The <code>StreamingHTTPEndpoint</code> managed by this MBean.
-     * @param parent The parent MBean in the management hierarchy.
-     */
-    public StreamingHTTPEndpointControl(StreamingHTTPEndpoint endpoint, BaseControl parent)
-    {
-        super(endpoint, parent);
-    }
-
-    /** {@inheritDoc} */
-    public String getType()
-    {
-        return TYPE;
-    }
-}
+/*
+ * 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.endpoints;
+
+import flex.management.BaseControl;
+import flex.messaging.endpoints.StreamingHTTPEndpoint;
+
+/**
+ * The <code>StreamingHTTPEndpointControl</code> class is the MBean implemenation
+ * for monitoring and managing a <code>StreamingHTTPEndpoint</code> at runtime.
+ */
+public class StreamingHTTPEndpointControl extends StreamingEndpointControl implements
+    StreamingHTTPEndpointControlMBean
+{
+    private static final String TYPE = "StreamingHTTPEndpoint";
+
+    /**
+     * Constructs a <code>StreamingHTTPEndpointControl</code>, assigning managed message
+     * endpoint and parent MBean.
+     *
+     * @param endpoint The <code>StreamingHTTPEndpoint</code> managed by this MBean.
+     * @param parent The parent MBean in the management hierarchy.
+     */
+    public StreamingHTTPEndpointControl(StreamingHTTPEndpoint endpoint, BaseControl parent)
+    {
+        super(endpoint, parent);
+    }
+
+    /** {@inheritDoc} */
+    public String getType()
+    {
+        return TYPE;
+    }
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java
old mode 100755
new mode 100644
index 449253a..f17cb85
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/StreamingHTTPEndpointControlMBean.java
@@ -1,26 +1,26 @@
-/*
- * 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.endpoints;
-
-/**
- * Defines the runtime monitoring and management interface for managed streaming 
- * HTTP endpoints.
- */
-public interface StreamingHTTPEndpointControlMBean extends StreamingEndpointControlMBean
-{
-    // Empty for now
-}
+/*
+ * 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.endpoints;
+
+/**
+ * Defines the runtime monitoring and management interface for managed streaming 
+ * HTTP endpoints.
+ */
+public interface StreamingHTTPEndpointControlMBean extends StreamingEndpointControlMBean
+{
+    // Empty for now
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/endpoints/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/endpoints/package-info.java b/modules/core/src/flex/management/runtime/messaging/endpoints/package-info.java
old mode 100755
new mode 100644
index c04121d..0936f70
--- a/modules/core/src/flex/management/runtime/messaging/endpoints/package-info.java
+++ b/modules/core/src/flex/management/runtime/messaging/endpoints/package-info.java
@@ -1,17 +1,17 @@
-/*
- * 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.
- */
+/*
+ * 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.endpoints;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/log/LogControl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/log/LogControl.java b/modules/core/src/flex/management/runtime/messaging/log/LogControl.java
old mode 100755
new mode 100644
index ab26864..3fdbbde
--- a/modules/core/src/flex/management/runtime/messaging/log/LogControl.java
+++ b/modules/core/src/flex/management/runtime/messaging/log/LogControl.java
@@ -1,149 +1,149 @@
-/*
- * 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 flex.management.BaseControl;
-import flex.messaging.log.AbstractTarget;
-import flex.messaging.log.Log;
-import flex.messaging.log.Target;
-
-/**
- * The <code>LogControl</code> class is the MBean implemenation
- * for monitoring and managing a <code>Log</code> at runtime through the <code>LogManager</code>.
- * @author majacobs
- *
- */
-public class LogControl extends BaseControl implements
-        LogControlMBean
-{
-
-    private static final String TYPE = "Log"; // The type registered with the mbean server
-    private LogManager logManager; // Reference to the LogManager which interfaces with Log
-        
-    
-    /**
-     * Creates the mbean and registers it with the mbean server.
-     * 
-     * @param parent BaseControl
-     * @param manager A reference to the LogManager
-     */
-    public LogControl(BaseControl parent, LogManager manager)
-    {
-        super(parent);
-        this.logManager = manager;
-        register();
-    }
-    
-    
-    /**
-     * Sets the logging level for the target associated with the unique ID searchId.
-     * @param searchId the search ID
-     * @param level the log level
-     */
-    public void changeTargetLevel(String searchId, String level)
-    {
-        Target selectedTarget = Log.getTarget(searchId);
-        if (selectedTarget != null)
-        {
-            selectedTarget.setLevel(new Short(level).shortValue());
-        }
-    }
-    
-    /* (non-Javadoc)
-     * @see flex.management.BaseControl#getId()
-     */
-    public String getId()
-    {
-        return logManager.getId();
-    }
-    
-    /* (non-Javadoc)
-     * @see flex.management.BaseControl#getType()
-     */
-    public String getType()
-    {
-        return TYPE;
-    }
-
-    /**
-     * Return a string array of the loggers.
-     * @return a string array of loggers
-     */
-    public String[] getLoggers()
-    {
-        return logManager.getLoggers();
-    }
-
-    /* (non-Javadoc)
-     * @see flex.management.runtime.messaging.log.LogControlMBean#getTargets()
-     */
-    public String[] getTargets()
-    {
-        return logManager.getTargetIds();
-    }
-
-    /* (non-Javadoc)
-     * @see flex.management.runtime.messaging.log.LogControlMBean#addFilterForTarget(java.lang.String, java.lang.String)
-     */
-    public void addFilterForTarget(String targetId, String filter)
-    {
-        AbstractTarget target = (AbstractTarget) logManager.getTarget(targetId);
-        
-        if (target != null && logManager.checkFilter(filter))
-            target.addFilter(filter);
-    }
-
-    /* (non-Javadoc)
-     * @see flex.management.runtime.messaging.log.LogControlMBean#getTargetFilters(java.lang.String)
-     */
-    public String[] getTargetFilters(String targetId)
-    {
-        return logManager.getTargetFilters(targetId);
-    }
-
-    /* (non-Javadoc)
-     * @see flex.management.runtime.messaging.log.LogControlMBean#removeFilterForTarget(java.lang.String, java.lang.String)
-     */
-    public void removeFilterForTarget(String targetId, String filter)
-    {
-        AbstractTarget target = (AbstractTarget) logManager.getTarget(targetId);
-        
-        if (target != null && target.containsFilter(filter))
-            target.removeFilter(filter);
-    }
-    
-    /* (non-Javadoc)
-     * @see flex.management.runtime.messaging.log.LogControlMBean#getCategories()
-     */
-    public String[] getCategories()
-    {
-        return (String[]) logManager.getCategories().toArray(new String[0]);
-    }
-
-
-    public Integer getTargetLevel(String searchId)
-    {
-        AbstractTarget target = (AbstractTarget) logManager.getTarget(searchId);
-        
-        if (target != null)
-        {
-            return new Integer(target.getLevel());
-        } else
-            return new Integer(-1);
-    }
-    
-}
+/*
+ * 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 flex.management.BaseControl;
+import flex.messaging.log.AbstractTarget;
+import flex.messaging.log.Log;
+import flex.messaging.log.Target;
+
+/**
+ * The <code>LogControl</code> class is the MBean implemenation
+ * for monitoring and managing a <code>Log</code> at runtime through the <code>LogManager</code>.
+ * @author majacobs
+ *
+ */
+public class LogControl extends BaseControl implements
+        LogControlMBean
+{
+
+    private static final String TYPE = "Log"; // The type registered with the mbean server
+    private LogManager logManager; // Reference to the LogManager which interfaces with Log
+        
+    
+    /**
+     * Creates the mbean and registers it with the mbean server.
+     * 
+     * @param parent BaseControl
+     * @param manager A reference to the LogManager
+     */
+    public LogControl(BaseControl parent, LogManager manager)
+    {
+        super(parent);
+        this.logManager = manager;
+        register();
+    }
+    
+    
+    /**
+     * Sets the logging level for the target associated with the unique ID searchId.
+     * @param searchId the search ID
+     * @param level the log level
+     */
+    public void changeTargetLevel(String searchId, String level)
+    {
+        Target selectedTarget = Log.getTarget(searchId);
+        if (selectedTarget != null)
+        {
+            selectedTarget.setLevel(new Short(level).shortValue());
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see flex.management.BaseControl#getId()
+     */
+    public String getId()
+    {
+        return logManager.getId();
+    }
+    
+    /* (non-Javadoc)
+     * @see flex.management.BaseControl#getType()
+     */
+    public String getType()
+    {
+        return TYPE;
+    }
+
+    /**
+     * Return a string array of the loggers.
+     * @return a string array of loggers
+     */
+    public String[] getLoggers()
+    {
+        return logManager.getLoggers();
+    }
+
+    /* (non-Javadoc)
+     * @see flex.management.runtime.messaging.log.LogControlMBean#getTargets()
+     */
+    public String[] getTargets()
+    {
+        return logManager.getTargetIds();
+    }
+
+    /* (non-Javadoc)
+     * @see flex.management.runtime.messaging.log.LogControlMBean#addFilterForTarget(java.lang.String, java.lang.String)
+     */
+    public void addFilterForTarget(String targetId, String filter)
+    {
+        AbstractTarget target = (AbstractTarget) logManager.getTarget(targetId);
+        
+        if (target != null && logManager.checkFilter(filter))
+            target.addFilter(filter);
+    }
+
+    /* (non-Javadoc)
+     * @see flex.management.runtime.messaging.log.LogControlMBean#getTargetFilters(java.lang.String)
+     */
+    public String[] getTargetFilters(String targetId)
+    {
+        return logManager.getTargetFilters(targetId);
+    }
+
+    /* (non-Javadoc)
+     * @see flex.management.runtime.messaging.log.LogControlMBean#removeFilterForTarget(java.lang.String, java.lang.String)
+     */
+    public void removeFilterForTarget(String targetId, String filter)
+    {
+        AbstractTarget target = (AbstractTarget) logManager.getTarget(targetId);
+        
+        if (target != null && target.containsFilter(filter))
+            target.removeFilter(filter);
+    }
+    
+    /* (non-Javadoc)
+     * @see flex.management.runtime.messaging.log.LogControlMBean#getCategories()
+     */
+    public String[] getCategories()
+    {
+        return (String[]) logManager.getCategories().toArray(new String[0]);
+    }
+
+
+    public Integer getTargetLevel(String searchId)
+    {
+        AbstractTarget target = (AbstractTarget) logManager.getTarget(searchId);
+        
+        if (target != null)
+        {
+            return new Integer(target.getLevel());
+        } else
+            return new Integer(-1);
+    }
+    
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/log/LogControlMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/log/LogControlMBean.java b/modules/core/src/flex/management/runtime/messaging/log/LogControlMBean.java
old mode 100755
new mode 100644
index b4b129f..762c895
--- a/modules/core/src/flex/management/runtime/messaging/log/LogControlMBean.java
+++ b/modules/core/src/flex/management/runtime/messaging/log/LogControlMBean.java
@@ -1,80 +1,80 @@
-/*
- * 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 flex.management.BaseControlMBean;
-
-
-/**
- * Defines the exposed properties and operations of the LogControl.
- */
-public interface LogControlMBean extends BaseControlMBean
-{
-    /**
-     * Returns the array of log targets.
-     *
-     * @return The array of log targets.
-     */
-    String[] getTargets();
-
-    /**
-     * Returns the array of log target filters.
-     *
-     * @param targetId The target id.
-     * @return The array of log target filters.
-     */
-    String[] getTargetFilters(String targetId);
-
-    /**
-     * Returns the array of log categories.
-     *
-     * @return The array of log categories.
-     */
-    String[] getCategories();
-
-    /**
-     * Returns the target level.
-     *
-     * @param targetId The target id.
-     * @return The target level.
-     */
-    Integer getTargetLevel(String targetId);
-
-    /**
-     * Changes the target level.
-     *
-     * @param targetId The target id.
-     * @param level The target level.
-     */
-    void changeTargetLevel(String targetId, String level);
-
-    /**
-     * Adds a filter for the target.
-     *
-     * @param filter The filter.
-     * @param targetId The target id.
-     */
-    void addFilterForTarget(String filter, String targetId);
-
-    /**
-     * Removes a filter from the target.
-     *
-     * @param filter The filter.
-     * @param targetId The target id.
-     */
-    void removeFilterForTarget(String filter, String targetId);
-}
+/*
+ * 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 flex.management.BaseControlMBean;
+
+
+/**
+ * Defines the exposed properties and operations of the LogControl.
+ */
+public interface LogControlMBean extends BaseControlMBean
+{
+    /**
+     * Returns the array of log targets.
+     *
+     * @return The array of log targets.
+     */
+    String[] getTargets();
+
+    /**
+     * Returns the array of log target filters.
+     *
+     * @param targetId The target id.
+     * @return The array of log target filters.
+     */
+    String[] getTargetFilters(String targetId);
+
+    /**
+     * Returns the array of log categories.
+     *
+     * @return The array of log categories.
+     */
+    String[] getCategories();
+
+    /**
+     * Returns the target level.
+     *
+     * @param targetId The target id.
+     * @return The target level.
+     */
+    Integer getTargetLevel(String targetId);
+
+    /**
+     * Changes the target level.
+     *
+     * @param targetId The target id.
+     * @param level The target level.
+     */
+    void changeTargetLevel(String targetId, String level);
+
+    /**
+     * Adds a filter for the target.
+     *
+     * @param filter The filter.
+     * @param targetId The target id.
+     */
+    void addFilterForTarget(String filter, String targetId);
+
+    /**
+     * Removes a filter from the target.
+     *
+     * @param filter The filter.
+     * @param targetId The target id.
+     */
+    void removeFilterForTarget(String filter, String targetId);
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/log/LogManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/log/LogManager.java b/modules/core/src/flex/management/runtime/messaging/log/LogManager.java
old mode 100755
new mode 100644
index d6b72bc..d9c40fc
--- a/modules/core/src/flex/management/runtime/messaging/log/LogManager.java
+++ b/modules/core/src/flex/management/runtime/messaging/log/LogManager.java
@@ -1,266 +1,266 @@
-/*
- * 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.
- *
- * @author majacobs
- *
- */
-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 the filter string to check
-     * @return whether the category exists in LogCategories
-     */
-    public boolean checkFilter(String filter)
-    {
-        return categoryManager.checkFilter(filter);
-    }
-
-    /**
-     * Return a list of categories in LogCategories.
-     * @return the list of categories in LogCategories
-     */
-    public List getCategories()
-    {
-        return categoryManager.getCategories();
-    }
-
-    protected void validate()
-    {
-        if (isValid())
-            return;
-
-        super.validate();
-
-        if (log == null)
-        {
-            invalidate();
-            ConfigurationException ex = new ConfigurationException();
-            ex.setMessage(NULL_LOG_REF_EXCEPTION, new Object[]{});
-            throw ex;
-        }
-
-    }
-
-    /**
-     * This private class keeps track of what categories exist in LogCategories by implementing
-     * LogCategories and reflecting the interface's properties.
-     *
-     * @author majacobs
-     *
-     */
-    private class CategoryManager implements LogCategories
-    {
-        private List categories;
-
-        /**
-         * Construct an ArrayList for each category in the reflected public properties
-         * Note this will be incorrect if additional public properties are added to this class
-         * or to the interface LogCategories.
-         */
-        public CategoryManager()
-        {
-            categories = new ArrayList();
-
-            Field[] categoryFields = this.getClass().getFields();
-            for (int i = 0; i < categoryFields.length; i++)
-            {
-                try
-                {
-                    categories.add((String)categoryFields[i].get(this));
-                }
-                catch (IllegalAccessException iae)
-                {
-                    // Illegal Access on reflection
-                }
-            }
-        }
-
-
-        /**
-         * Check if any categories match with the filter (the filter is valid or not).
-         * @param filter the filter string to check
-         * @return whether the filter is valid  (with or without a trailing .*)
-         */
-        public boolean checkFilter(String filter)
-        {
-
-            for (int i = 0; i < categories.size(); i++)
-            {
-                if (Log.checkFilterToCategory((String)filter, (String)categories.get(i)))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Return a list of log categories.
-         * @return List a list of the categories
-         */
-        public List getCategories()
-        {
-            return Collections.unmodifiableList(new ArrayList(categories));
-        }
-    }
-}
+/*
+ * 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.
+ *
+ * @author majacobs
+ *
+ */
+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 the filter string to check
+     * @return whether the category exists in LogCategories
+     */
+    public boolean checkFilter(String filter)
+    {
+        return categoryManager.checkFilter(filter);
+    }
+
+    /**
+     * Return a list of categories in LogCategories.
+     * @return the list of categories in LogCategories
+     */
+    public List getCategories()
+    {
+        return categoryManager.getCategories();
+    }
+
+    protected void validate()
+    {
+        if (isValid())
+            return;
+
+        super.validate();
+
+        if (log == null)
+        {
+            invalidate();
+            ConfigurationException ex = new ConfigurationException();
+            ex.setMessage(NULL_LOG_REF_EXCEPTION, new Object[]{});
+            throw ex;
+        }
+
+    }
+
+    /**
+     * This private class keeps track of what categories exist in LogCategories by implementing
+     * LogCategories and reflecting the interface's properties.
+     *
+     * @author majacobs
+     *
+     */
+    private class CategoryManager implements LogCategories
+    {
+        private List categories;
+
+        /**
+         * Construct an ArrayList for each category in the reflected public properties
+         * Note this will be incorrect if additional public properties are added to this class
+         * or to the interface LogCategories.
+         */
+        public CategoryManager()
+        {
+            categories = new ArrayList();
+
+            Field[] categoryFields = this.getClass().getFields();
+            for (int i = 0; i < categoryFields.length; i++)
+            {
+                try
+                {
+                    categories.add((String)categoryFields[i].get(this));
+                }
+                catch (IllegalAccessException iae)
+                {
+                    // Illegal Access on reflection
+                }
+            }
+        }
+
+
+        /**
+         * Check if any categories match with the filter (the filter is valid or not).
+         * @param filter the filter string to check
+         * @return whether the filter is valid  (with or without a trailing .*)
+         */
+        public boolean checkFilter(String filter)
+        {
+
+            for (int i = 0; i < categories.size(); i++)
+            {
+                if (Log.checkFilterToCategory((String)filter, (String)categories.get(i)))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Return a list of log categories.
+         * @return List a list of the categories
+         */
+        public List getCategories()
+        {
+            return Collections.unmodifiableList(new ArrayList(categories));
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/log/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/log/package-info.java b/modules/core/src/flex/management/runtime/messaging/log/package-info.java
old mode 100755
new mode 100644
index 37d55e8..a3e940b
--- a/modules/core/src/flex/management/runtime/messaging/log/package-info.java
+++ b/modules/core/src/flex/management/runtime/messaging/log/package-info.java
@@ -1,18 +1,18 @@
-/*
- * 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.
- */
-
+/*
+ * 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;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/package-info.java b/modules/core/src/flex/management/runtime/messaging/package-info.java
old mode 100755
new mode 100644
index 8331825..c87a5f5
--- a/modules/core/src/flex/management/runtime/messaging/package-info.java
+++ b/modules/core/src/flex/management/runtime/messaging/package-info.java
@@ -1,17 +1,17 @@
-/*
- * 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.
- */
+/*
+ * 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;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControl.java b/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControl.java
old mode 100755
new mode 100644
index ad89011..70dea22
--- a/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControl.java
+++ b/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControl.java
@@ -1,51 +1,51 @@
-/*
- * 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.messaging.services.MessageService;
-
-/**
- * The <code>MessageServiceControl</code> class is the MBean implemenation
- * for monitoring and managing a <code>MessageService</code> at runtime.
- *
- * @author shodgson
- */
-public class MessageServiceControl extends ServiceControl implements
-        MessageServiceControlMBean
-{
-    private static final String TYPE = "MessageService";
-
-    /**
-     * Constructs a <code>MessageServiceControl</code>, assigning its id, managed
-     * message service and parent MBean.
-     *
-     * @param service The <code>MessageService</code> managed by this MBean.
-     * @param parent The parent MBean in the management hierarchy.
-     */
-    public MessageServiceControl(MessageService service, BaseControl parent)
-    {
-        super(service, parent);
-    }
-
-    /** {@inheritDoc} */
-    public String getType()
-    {
-        return TYPE;
-    }
-
-}
+/*
+ * 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.messaging.services.MessageService;
+
+/**
+ * The <code>MessageServiceControl</code> class is the MBean implemenation
+ * for monitoring and managing a <code>MessageService</code> at runtime.
+ *
+ * @author shodgson
+ */
+public class MessageServiceControl extends ServiceControl implements
+        MessageServiceControlMBean
+{
+    private static final String TYPE = "MessageService";
+
+    /**
+     * Constructs a <code>MessageServiceControl</code>, assigning its id, managed
+     * message service and parent MBean.
+     *
+     * @param service The <code>MessageService</code> managed by this MBean.
+     * @param parent The parent MBean in the management hierarchy.
+     */
+    public MessageServiceControl(MessageService service, BaseControl parent)
+    {
+        super(service, parent);
+    }
+
+    /** {@inheritDoc} */
+    public String getType()
+    {
+        return TYPE;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/flex-blazeds/blob/4f6a3052/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControlMBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControlMBean.java b/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControlMBean.java
old mode 100755
new mode 100644
index 8e7916d..ce010bf
--- a/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControlMBean.java
+++ b/modules/core/src/flex/management/runtime/messaging/services/MessageServiceControlMBean.java
@@ -1,28 +1,28 @@
-/*
- * 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;
-
-
-/**
- * Defines the runtime monitoring and management interface for managed message services.
- * 
- * @author shodgson
- */
-public interface MessageServiceControlMBean extends ServiceControlMBean
-{
-    // Empty for now.
-}
+/*
+ * 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;
+
+
+/**
+ * Defines the runtime monitoring and management interface for managed message services.
+ * 
+ * @author shodgson
+ */
+public interface MessageServiceControlMBean extends ServiceControlMBean
+{
+    // Empty for now.
+}


Mime
View raw message