Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBJ Hargrave2014-02-07 13:24:25 +0000
committerBJ Hargrave2014-02-07 13:48:55 +0000
commit3760fe1be94443c4166211b533c923a887e6ba22 (patch)
tree7691d2fcae5b41ddc0faef850753b27979dce3dd /bundles/org.eclipse.osgi/osgi/src/org
parentd4fd69826df5f9c87c205583d97916cdd8b7c255 (diff)
downloadrt.equinox.framework-3760fe1be94443c4166211b533c923a887e6ba22.tar.gz
rt.equinox.framework-3760fe1be94443c4166211b533c923a887e6ba22.tar.xz
rt.equinox.framework-3760fe1be94443c4166211b533c923a887e6ba22.zip
Bug 427662: dto: Refactor dto package names
The naming convention for DTO packages has been changed to place the dto segment at the end of the package name rather than in the middle. Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/osgi/src/org')
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/BundleDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/BundleDTO.java)33
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/FrameworkDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/FrameworkDTO.java)29
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/ServiceReferenceDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/ServiceReferenceDTO.java)34
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/package-info.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/package-info.java)8
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/packageinfo (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/packageinfo)0
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/BundleStartLevelDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/BundleStartLevelDTO.java)29
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/FrameworkStartLevelDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/FrameworkStartLevelDTO.java)17
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/package-info.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/package-info.java)8
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/packageinfo (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/packageinfo)0
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleRevisionDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionDTO.java)29
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleWireDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWireDTO.java)25
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleWiringDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringDTO.java)29
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/package-info.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/package-info.java)8
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/packageinfo (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/packageinfo)0
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/CapabilityDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/CapabilityDTO.java)18
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/CapabilityRefDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/CapabilityRefDTO.java)2
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/RequirementDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/RequirementDTO.java)38
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/RequirementRefDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/RequirementRefDTO.java)2
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/ResourceDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/ResourceDTO.java)15
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/WireDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/WireDTO.java)33
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/WiringDTO.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/WiringDTO.java)36
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/package-info.java (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/package-info.java)8
-rw-r--r--bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/packageinfo (renamed from bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/packageinfo)0
23 files changed, 250 insertions, 151 deletions
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/BundleDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/BundleDTO.java
index 93ea5712c..aa3070935 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/BundleDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/BundleDTO.java
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package org.osgi.dto.framework;
+package org.osgi.framework.dto;
import org.osgi.dto.DTO;
+import org.osgi.framework.Bundle;
/**
* Data Transfer Object for a Bundle.
@@ -29,27 +30,37 @@ import org.osgi.dto.DTO;
*/
public class BundleDTO extends DTO {
/**
- * The bundle's unique identifier.
- */
+ * The bundle's unique identifier.
+ *
+ * @see Bundle#getBundleId()
+ */
public long id;
/**
- * The time when the bundle was last modified.
- */
+ * The time when the bundle was last modified.
+ *
+ * @see Bundle#getLastModified()
+ */
public long lastModified;
/**
- * The bundle's state.
- */
+ * The bundle's state.
+ *
+ * @see Bundle#getState()
+ */
public int state;
/**
- * The bundle's symbolic name.
- */
+ * The bundle's symbolic name.
+ *
+ * @see Bundle#getSymbolicName()
+ */
public String symbolicName;
/**
- * The bundle's version.
- */
+ * The bundle's version.
+ *
+ * @see Bundle#getVersion()
+ */
public String version;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/FrameworkDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/FrameworkDTO.java
index bb0524ca0..7c525727c 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/FrameworkDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/FrameworkDTO.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package org.osgi.dto.framework;
+package org.osgi.framework.dto;
import java.util.List;
import java.util.Map;
import org.osgi.dto.DTO;
+import org.osgi.framework.BundleContext;
/**
* Data Transfer Object for a Framework.
@@ -34,20 +35,26 @@ import org.osgi.dto.DTO;
*/
public class FrameworkDTO extends DTO {
/**
- * The bundles that are installed in the framework.
- */
+ * The bundles that are installed in the framework.
+ *
+ * @see BundleContext#getBundles()
+ */
public List<BundleDTO> bundles;
/**
- * The launch properties of the framework.
- *
- * The value type must be a numerical type, Boolean, String, DTO or an array
- * of any of the former.
- */
+ * The launch properties of the framework.
+ *
+ * The value type must be a numerical type, Boolean, String, DTO or an array
+ * of any of the former.
+ *
+ * @see BundleContext#getProperty(String)
+ */
public Map<String, Object> properties;
/**
- * The services that are registered in the framework.
- */
+ * The services that are registered in the framework.
+ *
+ * @see BundleContext#getServiceReferences(String, String)
+ */
public List<ServiceReferenceDTO> services;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/ServiceReferenceDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/ServiceReferenceDTO.java
index e0a54dbaa..53c7703ae 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/ServiceReferenceDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/ServiceReferenceDTO.java
@@ -14,10 +14,12 @@
* limitations under the License.
*/
-package org.osgi.dto.framework;
+package org.osgi.framework.dto;
import java.util.Map;
import org.osgi.dto.DTO;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
/**
* Data Transfer Object for a ServiceReference.
@@ -35,25 +37,33 @@ import org.osgi.dto.DTO;
*/
public class ServiceReferenceDTO extends DTO {
/**
- * The {@code service.id} of the service.
- */
+ * The {@code service.id} of the service.
+ *
+ * @see Constants#SERVICE_ID
+ */
public long id;
/**
- * The id of the bundle that registered the service.
- */
+ * The id of the bundle that registered the service.
+ *
+ * @see ServiceReference#getBundle()
+ */
public long bundle;
/**
- * The properties for the service.
- *
- * The value type must be a numerical type, Boolean, String, DTO or an array
- * of any of the former.
- */
+ * The properties for the service.
+ *
+ * The value type must be a numerical type, Boolean, String, DTO or an array
+ * of any of the former.
+ *
+ * @see ServiceReference#getProperty(String)
+ */
public Map<String, Object> properties;
/**
- * The ids of the bundles that are using the service.
- */
+ * The ids of the bundles that are using the service.
+ *
+ * @see ServiceReference#getUsingBundles()
+ */
public long[] usingBundles;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/package-info.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/package-info.java
index 0ceb5d4b6..2acfb6f16 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/package-info.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,17 +26,17 @@
* <p>
* Example import for consumers using the API in this package:
* <p>
- * {@code Import-Package: org.osgi.dto.framework; version="[1.8,2.0)"}
+ * {@code Import-Package: org.osgi.framework.dto; version="[1.8,2.0)"}
* <p>
* Example import for providers implementing the API in this package:
* <p>
- * {@code Import-Package: org.osgi.dto.framework; version="[1.8,1.9)"}
+ * {@code Import-Package: org.osgi.framework.dto; version="[1.8,1.9)"}
*
* @author $Id$
*/
@Version("1.8")
-package org.osgi.dto.framework;
+package org.osgi.framework.dto;
import org.osgi.annotation.versioning.Version;
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/packageinfo b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/packageinfo
index ed9885d37..ed9885d37 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/packageinfo
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/dto/packageinfo
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/BundleStartLevelDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/BundleStartLevelDTO.java
index 6fb563a3c..81430e244 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/BundleStartLevelDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/BundleStartLevelDTO.java
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package org.osgi.dto.framework.startlevel;
+package org.osgi.framework.startlevel.dto;
import org.osgi.dto.DTO;
+import org.osgi.framework.startlevel.BundleStartLevel;
/**
* Data Transfer Object for a BundleStartLevel.
@@ -30,23 +31,31 @@ import org.osgi.dto.DTO;
*/
public class BundleStartLevelDTO extends DTO {
/**
- * The id of the bundle associated with this start level.
- */
+ * The id of the bundle associated with this start level.
+ *
+ * @see BundleStartLevel#getBundle()
+ */
public long bundle;
/**
- * The assigned start level value for the bundle.
- */
+ * The assigned start level value for the bundle.
+ *
+ * @see BundleStartLevel#getStartLevel()
+ */
public int startLevel;
/**
- * The bundle's autostart setting indicates that the activation policy
- * declared in the bundle manifest must be used.
- */
+ * The bundle's autostart setting indicates that the activation policy
+ * declared in the bundle manifest must be used.
+ *
+ * @see BundleStartLevel#isActivationPolicyUsed()
+ */
public boolean activationPolicyUsed;
/**
- * The bundle's autostart setting indicates it must be started.
- */
+ * The bundle's autostart setting indicates it must be started.
+ *
+ * @see BundleStartLevel#isPersistentlyStarted()
+ */
public boolean persistentlyStarted;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/FrameworkStartLevelDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/FrameworkStartLevelDTO.java
index 5025710fa..2d1de40ba 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/FrameworkStartLevelDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/FrameworkStartLevelDTO.java
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package org.osgi.dto.framework.startlevel;
+package org.osgi.framework.startlevel.dto;
import org.osgi.dto.DTO;
+import org.osgi.framework.startlevel.FrameworkStartLevel;
/**
* Data Transfer Object for a FrameworkStartLevel.
@@ -30,13 +31,17 @@ import org.osgi.dto.DTO;
*/
public class FrameworkStartLevelDTO extends DTO {
/**
- * The active start level value for the framework.
- */
+ * The active start level value for the framework.
+ *
+ * @see FrameworkStartLevel#getStartLevel()
+ */
public int startLevel;
/**
- * The initial start level value that is assigned to a bundle when it is
- * first installed.
- */
+ * The initial start level value that is assigned to a bundle when it is
+ * first installed.
+ *
+ * @see FrameworkStartLevel#getInitialBundleStartLevel()
+ */
public int initialBundleStartLevel;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/package-info.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/package-info.java
index 64a78736e..62262c52e 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/package-info.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,17 +26,17 @@
* <p>
* Example import for consumers using the API in this package:
* <p>
- * {@code Import-Package: org.osgi.dto.framework.startlevel; version="[1.0,2.0)"}
+ * {@code Import-Package: org.osgi.framework.startlevel.dto; version="[1.0,2.0)"}
* <p>
* Example import for providers implementing the API in this package:
* <p>
- * {@code Import-Package: org.osgi.dto.framework.startlevel; version="[1.0,1.1)"}
+ * {@code Import-Package: org.osgi.framework.startlevel.dto; version="[1.0,1.1)"}
*
* @author $Id$
*/
@Version("1.0")
-package org.osgi.dto.framework.startlevel;
+package org.osgi.framework.startlevel.dto;
import org.osgi.annotation.versioning.Version;
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/packageinfo b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/packageinfo
index 7c8de0324..7c8de0324 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/startlevel/packageinfo
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/dto/packageinfo
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleRevisionDTO.java
index 5ffceceb8..7f5e82fcc 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleRevisionDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleRevisionDTO.java
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package org.osgi.dto.framework.wiring;
+package org.osgi.framework.wiring.dto;
-import org.osgi.dto.resource.ResourceDTO;
+import org.osgi.framework.wiring.BundleRevision;
+import org.osgi.resource.dto.ResourceDTO;
/**
* Data Transfer Object for a BundleWiring.
@@ -32,22 +33,30 @@ import org.osgi.dto.resource.ResourceDTO;
*/
public class BundleRevisionDTO extends ResourceDTO {
/**
- * The symbolic name of the bundle revision.
- */
+ * The symbolic name of the bundle revision.
+ *
+ * @see BundleRevision#getSymbolicName()
+ */
public String symbolicName;
/**
- * The type of the bundle revision.
- */
+ * The type of the bundle revision.
+ *
+ * @see BundleRevision#getTypes()
+ */
public int type;
/**
- * The version of the bundle revision.
- */
+ * The version of the bundle revision.
+ *
+ * @see BundleRevision#getVersion()
+ */
public String version;
/**
- * The id of the bundle associated with the bundle revision.
- */
+ * The id of the bundle associated with the bundle revision.
+ *
+ * @see BundleRevision#getBundle()
+ */
public long bundle;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWireDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleWireDTO.java
index 71ad728ad..ef923b414 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWireDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleWireDTO.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package org.osgi.dto.framework.wiring;
+package org.osgi.framework.wiring.dto;
-import org.osgi.dto.resource.WireDTO;
-import org.osgi.dto.resource.WiringDTO;
+import org.osgi.framework.wiring.BundleWire;
+import org.osgi.resource.dto.WireDTO;
+import org.osgi.resource.dto.WiringDTO;
/**
* Data Transfer Object for a BundleWire.
@@ -30,16 +31,18 @@ import org.osgi.dto.resource.WiringDTO;
*/
public class BundleWireDTO extends WireDTO {
/**
- * The identifier of the provider wiring for the bundle wire.
- *
- * @see WiringDTO#id
- */
+ * The identifier of the provider wiring for the bundle wire.
+ *
+ * @see WiringDTO#id
+ * @see BundleWire#getProviderWiring()
+ */
public int providerWiring;
/**
- * The identifier of the requiring wiring for the bundle wire.
- *
- * @see WiringDTO#id
- */
+ * The identifier of the requiring wiring for the bundle wire.
+ *
+ * @see WiringDTO#id
+ * @see BundleWire#getRequirerWiring()
+ */
public int requirerWiring;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleWiringDTO.java
index aa30c24c4..e23e80fcf 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/BundleWiringDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/BundleWiringDTO.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package org.osgi.dto.framework.wiring;
+package org.osgi.framework.wiring.dto;
import java.util.Set;
import org.osgi.dto.DTO;
-import org.osgi.dto.resource.WiringDTO;
+import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.resource.dto.WiringDTO;
/**
* Data Transfer Object for a BundleWiring graph.
@@ -34,8 +35,10 @@ import org.osgi.dto.resource.WiringDTO;
*/
public class BundleWiringDTO extends DTO {
/**
- * The id of the bundle associated with the bundle wiring graph.
- */
+ * The id of the bundle associated with the bundle wiring graph.
+ *
+ * @see BundleWiring#getBundle()
+ */
public long bundle;
/**
@@ -75,16 +78,20 @@ public class BundleWiringDTO extends DTO {
*/
public static class NodeDTO extends WiringDTO {
/**
- * The bundle wiring's in use setting indicates that the bundle wiring
- * is in use.
- */
+ * The bundle wiring's in use setting indicates that the bundle wiring
+ * is in use.
+ *
+ * @see BundleWiring#isInUse()
+ */
public boolean inUse;
/**
- * The current state of the bundle wiring. The bundle wiring's current
- * setting indicates that the bundle wiring is the current bundle wiring
- * for the bundle.
- */
+ * The current state of the bundle wiring. The bundle wiring's current
+ * setting indicates that the bundle wiring is the current bundle wiring
+ * for the bundle.
+ *
+ * @see BundleWiring#isCurrent()
+ */
public boolean current;
}
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/package-info.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/package-info.java
index 0c4a2ff42..691bcdcde 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/package-info.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,17 +26,17 @@
* <p>
* Example import for consumers using the API in this package:
* <p>
- * {@code Import-Package: org.osgi.dto.framework.wiring; version="[1.2,2.0)"}
+ * {@code Import-Package: org.osgi.framework.wiring.dto; version="[1.2,2.0)"}
* <p>
* Example import for providers implementing the API in this package:
* <p>
- * {@code Import-Package: org.osgi.dto.framework.wiring; version="[1.2,1.3)"}
+ * {@code Import-Package: org.osgi.framework.wiring.dto; version="[1.2,1.3)"}
*
* @author $Id$
*/
@Version("1.2")
-package org.osgi.dto.framework.wiring;
+package org.osgi.framework.wiring.dto;
import org.osgi.annotation.versioning.Version;
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/packageinfo b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/packageinfo
index ef7df68cb..ef7df68cb 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/framework/wiring/packageinfo
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/dto/packageinfo
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/CapabilityDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/CapabilityDTO.java
index 4fa2c2d19..1f7fad1bf 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/CapabilityDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/CapabilityDTO.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package org.osgi.dto.resource;
+package org.osgi.resource.dto;
import java.util.Map;
import org.osgi.dto.DTO;
+import org.osgi.resource.Capability;
/**
* Data Transfer Object for a Capability.
@@ -36,11 +37,15 @@ public class CapabilityDTO extends DTO {
/**
* The namespace for the capability.
+ *
+ * @see Capability#getNamespace()
*/
public String namespace;
/**
* The directives for the capability.
+ *
+ * @see Capability#getDirectives()
*/
public Map<String, String> directives;
@@ -50,13 +55,16 @@ public class CapabilityDTO extends DTO {
* <p>
* The value type must be a numerical type, Boolean, String, DTO or an array
* of any of the former.
+ *
+ * @see Capability#getAttributes()
*/
public Map<String, Object> attributes;
/**
- * The identifier of the resource declaring the capability.
- *
- * @see ResourceDTO#id
- */
+ * The identifier of the resource declaring the capability.
+ *
+ * @see ResourceDTO#id
+ * @see Capability#getResource()
+ */
public int resource;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/CapabilityRefDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/CapabilityRefDTO.java
index 8ee4a6d04..81d5b85fd 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/CapabilityRefDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/CapabilityRefDTO.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.osgi.dto.resource;
+package org.osgi.resource.dto;
import org.osgi.dto.DTO;
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/RequirementDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/RequirementDTO.java
index 0c54329af..dfa21db37 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/RequirementDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/RequirementDTO.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package org.osgi.dto.resource;
+package org.osgi.resource.dto;
import java.util.Map;
import org.osgi.dto.DTO;
+import org.osgi.resource.Requirement;
/**
* Data Transfer Object for a Requirement.
@@ -35,28 +36,35 @@ public class RequirementDTO extends DTO {
public int id;
/**
- * The namespace for the requirement.
- */
+ * The namespace for the requirement.
+ *
+ * @see Requirement#getNamespace()
+ */
public String namespace;
/**
- * The directives for the requirement.
- */
+ * The directives for the requirement.
+ *
+ * @see Requirement#getDirectives()
+ */
public Map<String, String> directives;
/**
- * The attributes for the requirement.
- *
- * <p>
- * The value type must be a numerical type, Boolean, String, DTO or an array
- * of any of the former.
- */
+ * The attributes for the requirement.
+ *
+ * <p>
+ * The value type must be a numerical type, Boolean, String, DTO or an array
+ * of any of the former.
+ *
+ * @see Requirement#getAttributes()
+ */
public Map<String, Object> attributes;
/**
- * The identifier of the resource declaring the requirement.
- *
- * @see ResourceDTO#id
- */
+ * The identifier of the resource declaring the requirement.
+ *
+ * @see ResourceDTO#id
+ * @see Requirement#getResource()
+ */
public int resource;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/RequirementRefDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/RequirementRefDTO.java
index 3c4f2a732..8f913a72d 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/RequirementRefDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/RequirementRefDTO.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.osgi.dto.resource;
+package org.osgi.resource.dto;
import org.osgi.dto.DTO;
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/ResourceDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/ResourceDTO.java
index 10cdb8417..377b7aff2 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/ResourceDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/ResourceDTO.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package org.osgi.dto.resource;
+package org.osgi.resource.dto;
import java.util.List;
import org.osgi.dto.DTO;
+import org.osgi.resource.Resource;
/**
* Data Transfer Object for a Resource.
@@ -35,12 +36,16 @@ public class ResourceDTO extends DTO {
public int id;
/**
- * The capabilities of the resource.
- */
+ * The capabilities of the resource.
+ *
+ * @see Resource#getCapabilities(String)
+ */
public List<CapabilityDTO> capabilities;
/**
- * The requirements of the resource.
- */
+ * The requirements of the resource.
+ *
+ * @see Resource#getRequirements(String)
+ */
public List<RequirementDTO> requirements;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/WireDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/WireDTO.java
index c7dce0c97..017ea7cc3 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/WireDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/WireDTO.java
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-package org.osgi.dto.resource;
+package org.osgi.resource.dto;
import org.osgi.dto.DTO;
+import org.osgi.resource.Wire;
/**
* Data Transfer Object for a Wire.
@@ -26,26 +27,32 @@ import org.osgi.dto.DTO;
*/
public class WireDTO extends DTO {
/**
- * Reference to the Capability for the wire.
- */
+ * Reference to the Capability for the wire.
+ *
+ * @see Wire#getCapability()
+ */
public CapabilityRefDTO capability;
/**
- * Reference to the Requirement for the wire.
- */
+ * Reference to the Requirement for the wire.
+ *
+ * @see Wire#getRequirement()
+ */
public RequirementRefDTO requirement;
/**
- * The identifier of the provider resource for the wire.
- *
- * @see ResourceDTO#id
- */
+ * The identifier of the provider resource for the wire.
+ *
+ * @see ResourceDTO#id
+ * @see Wire#getProvider()
+ */
public int provider;
/**
- * The identifier of the requiring resource for the wire.
- *
- * @see ResourceDTO#id
- */
+ * The identifier of the requiring resource for the wire.
+ *
+ * @see ResourceDTO#id
+ * @see Wire#getRequirer()
+ */
public int requirer;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/WiringDTO.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/WiringDTO.java
index f39e72a27..8dc3844e5 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/WiringDTO.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/WiringDTO.java
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-package org.osgi.dto.resource;
+package org.osgi.resource.dto;
import java.util.List;
import org.osgi.dto.DTO;
+import org.osgi.resource.Wiring;
/**
* Data Transfer Object for a Wiring node.
@@ -35,29 +36,38 @@ public class WiringDTO extends DTO {
public int id;
/**
- * The references to the capabilities for the wiring node.
- */
+ * The references to the capabilities for the wiring node.
+ *
+ * @see Wiring#getResourceCapabilities(String)
+ */
public List<CapabilityRefDTO> capabilities;
/**
- * The references to the requirements for the wiring node.
- */
+ * The references to the requirements for the wiring node.
+ *
+ * @see Wiring#getResourceRequirements(String)
+ */
public List<RequirementRefDTO> requirements;
/**
- * The provided wires for the wiring node.
- */
+ * The provided wires for the wiring node.
+ *
+ * @see Wiring#getProvidedResourceWires(String)
+ */
public List<WireDTO> providedWires;
/**
- * The required wires for the wiring node.
- */
+ * The required wires for the wiring node.
+ *
+ * @see Wiring#getRequiredResourceWires(String)
+ */
public List<WireDTO> requiredWires;
/**
- * The identifier of the resource associated with the wiring node.
- *
- * @see ResourceDTO#id
- */
+ * The identifier of the resource associated with the wiring node.
+ *
+ * @see ResourceDTO#id
+ * @see Wiring#getResource()
+ */
public int resource;
}
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/package-info.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/package-info.java
index 474e3b23f..6e316cdda 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/package-info.java
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) OSGi Alliance (2012, 2013). All Rights Reserved.
+ * Copyright (c) OSGi Alliance (2012, 2014). All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,17 +26,17 @@
* <p>
* Example import for consumers using the API in this package:
* <p>
- * {@code Import-Package: org.osgi.dto.resource; version="[1.0,2.0)"}
+ * {@code Import-Package: org.osgi.resource.dto; version="[1.0,2.0)"}
* <p>
* Example import for providers implementing the API in this package:
* <p>
- * {@code Import-Package: org.osgi.dto.resource; version="[1.0,1.1)"}
+ * {@code Import-Package: org.osgi.resource.dto; version="[1.0,1.1)"}
*
* @author $Id$
*/
@Version("1.0")
-package org.osgi.dto.resource;
+package org.osgi.resource.dto;
import org.osgi.annotation.versioning.Version;
diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/packageinfo b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/packageinfo
index 7c8de0324..7c8de0324 100644
--- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/dto/resource/packageinfo
+++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/resource/dto/packageinfo

Back to the top