Author: dkulp
Date: Wed Jan 23 16:33:05 2013
New Revision: 1437547
URL: http://svn.apache.org/viewvc?rev=1437547&view=rev
Log:
Restore some constructors to maintain compatibility with 1.0
Modified:
aries/trunk/jmx/jmx-api/pom.xml
aries/trunk/jmx/jmx-core/pom.xml
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo
Modified: aries/trunk/jmx/jmx-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-api/pom.xml?rev=1437547&r1=1437546&r2=1437547&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-api/pom.xml (original)
+++ aries/trunk/jmx/jmx-api/pom.xml Wed Jan 23 16:33:05 2013
@@ -27,7 +27,7 @@
<artifactId>org.apache.aries.jmx.api</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX API</name>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<description>
This bundle contains the JMX 1.1.0 API
</description>
Modified: aries/trunk/jmx/jmx-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/pom.xml?rev=1437547&r1=1437546&r2=1437547&view=diff
==============================================================================
--- aries/trunk/jmx/jmx-core/pom.xml (original)
+++ aries/trunk/jmx/jmx-core/pom.xml Wed Jan 23 16:33:05 2013
@@ -27,7 +27,7 @@
<artifactId>org.apache.aries.jmx.core</artifactId>
<packaging>bundle</packaging>
<name>Apache Aries JMX Core</name>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<description>
This bundle contains the core implementation
of the JMX Control specification
Modified:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java?rev=1437547&r1=1437546&r2=1437547&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java
(original)
+++
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/GroupData.java
Wed Jan 23 16:33:05 2013
@@ -66,7 +66,19 @@ public class GroupData extends UserData
* Constructs new GroupData.
*
* @param name group name.
+ * @param members basic members.
+ * @param requiredMembers required members.
+ */
+ public GroupData(String name, String[] members, String[] requiredMembers) {
+ this(name, null, null, members, requiredMembers);
+ }
+
+ /**
+ * Constructs new GroupData.
+ *
+ * @param name group name.
* @param properties group properties.
+ * @param credentials group credentials.
* @param members basic members.
* @param requiredMembers required members.
*/
Modified:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java?rev=1437547&r1=1437546&r2=1437547&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java
(original)
+++
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/RoleData.java
Wed Jan 23 16:33:05 2013
@@ -72,6 +72,15 @@ public class RoleData {
* Constructs new RoleData.
* @param name role name.
* @param type role type.
+ */
+ public RoleData(String name, int type) {
+ this(name, type, null);
+ }
+
+ /**
+ * Constructs new RoleData.
+ * @param name role name.
+ * @param type role type.
* @param properties role properties.
*/
public RoleData(String name, int type, Dictionary properties) {
Modified:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java?rev=1437547&r1=1437546&r2=1437547&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java
(original)
+++
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/UserData.java
Wed Jan 23 16:33:05 2013
@@ -55,6 +55,17 @@ public class UserData extends RoleData {
public UserData(User user){
this(user.getName(), user.getType(), user.getProperties(),
user.getCredentials());
}
+
+
+ /**
+ * Constructs new UserData.
+ *
+ * @param name user name.
+ * @param type role type.
+ */
+ public UserData(String name, int type){
+ super(name, type);
+ }
/**
* Constructs new UserData.
Modified:
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo?rev=1437547&r1=1437546&r2=1437547&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo
(original)
+++
aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/packageinfo
Wed Jan 23 16:33:05 2013
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
#
-version 2.0.0
+version 1.1.0
