You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by dk...@apache.org on 2011/11/21 22:08:36 UTC
svn commit: r1204705 - in /aries/trunk/application:
application-modeller/src/main/java/org/apache/aries/application/modelling/impl/
application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/
application-utils/src/main/java/or...
Author: dkulp
Date: Mon Nov 21 21:08:35 2011
New Revision: 1204705
URL: http://svn.apache.org/viewvc?rev=1204705&view=rev
Log:
Get application compiling with java5 compliance level
Modified:
aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java
aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java
aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java
aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java
aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java
aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentContentImpl.java
Modified: aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java?rev=1204705&r1=1204704&r2=1204705&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java (original)
+++ aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/AbstractParserProxy.java Mon Nov 21 21:08:35 2011
@@ -54,7 +54,6 @@ abstract public class AbstractParserProx
_modellingManager = m;
}
- @Override
public List<? extends WrappedServiceMetadata> parse(List<URL> blueprintsToParse) throws Exception {
_logger.debug(LOG_ENTRY, "parse", new Object[]{blueprintsToParse});
ComponentDefinitionRegistry cdr = parseCDR (blueprintsToParse);
@@ -63,7 +62,6 @@ abstract public class AbstractParserProx
return result;
}
- @Override
public List<? extends WrappedServiceMetadata> parse(URL blueprintToParse) throws Exception {
_logger.debug(LOG_ENTRY, "parse", new Object[]{blueprintToParse});
List<URL> list = new ArrayList<URL>();
@@ -74,7 +72,6 @@ abstract public class AbstractParserProx
return result;
}
- @Override
public List<? extends WrappedServiceMetadata> parse(InputStream blueprintToParse) throws Exception {
_logger.debug(LOG_ENTRY, "parse", new Object[]{blueprintToParse});
ComponentDefinitionRegistry cdr = parseCDR (blueprintToParse);
@@ -84,7 +81,6 @@ abstract public class AbstractParserProx
}
- @Override
public ParsedServiceElements parseAllServiceElements(InputStream blueprintToParse) throws Exception {
_logger.debug(LOG_ENTRY, "parseAllServiceElements", new Object[]{blueprintToParse});
ComponentDefinitionRegistry cdr = parseCDR (blueprintToParse);
Modified: aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java?rev=1204705&r1=1204704&r2=1204705&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java (original)
+++ aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/DeployedBundlesImpl.java Mon Nov 21 21:08:35 2011
@@ -101,7 +101,6 @@ public final class DeployedBundlesImpl i
* @param resolvedBundle the bundle that has been provisioned.
* @param resolvedVersion the specific version provisioned.
*/
- @Override
public void addBundle(ModelledResource modelledBundle)
{
logger.debug(LOG_ENTRY, "addBundle", new Object[]{modelledBundle});
@@ -159,7 +158,6 @@ public final class DeployedBundlesImpl i
* Get the value corresponding to the Deployed-Content header in the deployment.mf.
* @return a manifest entry, or an empty string if there is no content.
*/
- @Override
public String getContent()
{
return createManifestString(deployedContent);
@@ -169,7 +167,6 @@ public final class DeployedBundlesImpl i
* Get the value corresponding to the Deployed-Use-Bundle header in the deployment.mf.
* @return a manifest entry, or an empty string if there is no content.
*/
- @Override
public String getUseBundle()
{
return createManifestString(deployedUseBundle);
@@ -179,7 +176,6 @@ public final class DeployedBundlesImpl i
* Get the value corresponding to the Provision-Bundle header in the deployment.mf.
* @return a manifest entry, or an empty string if there is no content.
*/
- @Override
public String getProvisionBundle()
{
return createManifestString(deployedProvisionBundle);
@@ -190,7 +186,6 @@ public final class DeployedBundlesImpl i
* @return a manifest entry, or an empty string if there is no content.
* @throws ResolverException if the requirements could not be resolved.
*/
- @Override
public String getImportPackage() throws ResolverException
{
logger.debug(LOG_ENTRY, "getImportPackage");
@@ -240,7 +235,6 @@ public final class DeployedBundlesImpl i
* b) the service was not available internally when the app was first deployed
*
*/
- @Override
public String getDeployedImportService() {
logger.debug(LOG_ENTRY,"getDeployedImportService");
Collection<ImportedService> deployedBundleServiceImports = new ArrayList<ImportedService>();
@@ -415,7 +409,6 @@ public final class DeployedBundlesImpl i
* Get the set of bundles that are going to be deployed into an isolated framework
* @return a set of bundle metadata
*/
- @Override
public Collection<ModelledResource> getDeployedContent()
{
logger.debug(LOG_ENTRY, "getDeployedContent");
@@ -431,7 +424,6 @@ public final class DeployedBundlesImpl i
* needs to be called something else.
*
*/
- @Override
public Collection<ModelledResource> getDeployedProvisionBundle ()
{
logger.debug(LOG_ENTRY,"getDeployedProvisionBundle");
@@ -445,7 +437,6 @@ public final class DeployedBundlesImpl i
* @return a set of bundle metadata.
* @throws ResolverException if the requirements could not be resolved.
*/
- @Override
public Collection<ModelledResource> getRequiredUseBundle() throws ResolverException
{
logger.debug(LOG_ENTRY, "getRequiredUseBundle");
@@ -467,7 +458,6 @@ public final class DeployedBundlesImpl i
/** This method will be overridden by a PostResolveTransformer returning an extended version of
* DeployedBundles
*/
- @Override
public Map<String, String> getExtraHeaders() {
logger.debug (LOG_ENTRY, "getExtraHeaders");
Map<String, String> result = Collections.emptyMap();
Modified: aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java?rev=1204705&r1=1204704&r2=1204705&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java (original)
+++ aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java Mon Nov 21 21:08:35 2011
@@ -238,55 +238,42 @@ public class ModelledResourceImpl implem
}
- @Override
public String getLocation() {
logger.debug(LOG_ENTRY, "getLocation");
logger.debug(LOG_EXIT, "getLocation", _fileURI);
return _fileURI;
}
-
- @Override
public ExportedBundle getExportedBundle() {
logger.debug(LOG_ENTRY, "getExportedBundle");
logger.debug(LOG_EXIT, "getExportedBundle", _exportedBundle);
return _exportedBundle;
}
-
- @Override
public Collection<ExportedPackage> getExportedPackages() {
logger.debug(LOG_ENTRY, "getExportedPackages");
logger.debug(LOG_EXIT, "getExportedPackages", _exportedPackages);
return Collections.unmodifiableCollection(_exportedPackages);
}
-
-
- @Override
public Collection<ImportedPackage> getImportedPackages() {
logger.debug(LOG_ENTRY, "getImportedPackages");
logger.debug(LOG_EXIT, "getImportedPackages", _importedPackages);
return Collections.unmodifiableCollection(_importedPackages);
}
- @Override
public Collection<ExportedService> getExportedServices() {
logger.debug(LOG_ENTRY, "getExportedServices");
logger.debug(LOG_EXIT, "getExportedServices", _exportedServices);
return Collections.unmodifiableCollection(_exportedServices);
}
-
- @Override
public Collection<ImportedService> getImportedServices() {
logger.debug(LOG_ENTRY, "getImportedServices");
logger.debug(LOG_EXIT, "getImportedServices", _exportedServices);
return Collections.unmodifiableCollection(_importedServices);
}
-
- @Override
public String getSymbolicName() {
logger.debug(LOG_ENTRY, "getSymbolicName");
String result = _exportedBundle.getSymbolicName();
@@ -294,8 +281,6 @@ public class ModelledResourceImpl implem
return result;
}
-
- @Override
public String getVersion() {
logger.debug(LOG_ENTRY, "getVersion");
String result = _exportedBundle.getVersion();
@@ -303,8 +288,6 @@ public class ModelledResourceImpl implem
return result;
}
-
- @Override
public String toDeploymentString() {
logger.debug(LOG_ENTRY, "toDeploymentString");
String result = _exportedBundle.toDeploymentString();
@@ -312,30 +295,25 @@ public class ModelledResourceImpl implem
return result;
}
-
- @Override
public ResourceType getType() {
logger.debug(LOG_ENTRY, "getType");
logger.debug(LOG_EXIT, "getType", ResourceType.BUNDLE);
return _resourceType;
}
- @Override
public String toString() {
return toDeploymentString();
}
- @Override
-public Collection<ImportedBundle> getRequiredBundles() {
+ public Collection<ImportedBundle> getRequiredBundles() {
logger.debug(LOG_ENTRY, "getRequiredBundles");
logger.debug(LOG_EXIT, "getRequiredBundles", _requiredBundles);
return Collections.unmodifiableCollection(_requiredBundles);
}
- @Override
-public ImportedBundle getFragmentHost() {
+ public ImportedBundle getFragmentHost() {
logger.debug(LOG_ENTRY, "getFragmentHost");
ImportedBundle result = _exportedBundle.getFragmentHost();
logger.debug(LOG_EXIT, "getFragmentHost", result);
@@ -343,8 +321,7 @@ public ImportedBundle getFragmentHost()
}
- @Override
-public boolean isFragment() {
+ public boolean isFragment() {
logger.debug(LOG_ENTRY, "isFragment");
boolean result = _exportedBundle.isFragment();
logger.debug(LOG_EXIT, "isFragment", result);
Modified: aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java?rev=1204705&r1=1204704&r2=1204705&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java (original)
+++ aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java Mon Nov 21 21:08:35 2011
@@ -90,13 +90,11 @@ public class ModelledResourceManagerImpl
* @return ParsedServiceElementsImpl
* @throws OpenFailureException
*/
- @Override
public ParsedServiceElements getServiceElements (IDirectory archive) throws ModellerException {
BundleManifest bm = BundleManifest.fromBundle(archive);
return getServiceElements(bm, archive);
}
- @Override
public ParsedServiceElements getServiceElements(InputStreamProvider archive) throws ModellerException {
ICloseableDirectory dir = null;
try {
@@ -156,7 +154,6 @@ public class ModelledResourceManagerImpl
return result;
}
- @Override
public ModelledResource getModelledResource(IDirectory bundle) throws ModellerException {
try {
return getModelledResource(bundle.toURL().toURI().toString(), bundle);
@@ -167,7 +164,6 @@ public class ModelledResourceManagerImpl
}
}
- @Override
public ModelledResource getModelledResource(String uri, InputStreamProvider bundle) throws ModellerException {
ICloseableDirectory dir = null;
try {
@@ -180,7 +176,6 @@ public class ModelledResourceManagerImpl
}
}
- @Override
public ModelledResource getModelledResource(String uri, IDirectory bundle) throws ModellerException{
_logger.debug(LOG_ENTRY, "getModelledResource", new Object[]{uri, bundle});
@@ -277,7 +272,6 @@ public class ModelledResourceManagerImpl
this.bpParser = bpParser;
}
- @Override
public boolean hasNext() {
valid = false;
ZipEntry entry;
@@ -306,7 +300,6 @@ public class ModelledResourceManagerImpl
return valid;
}
- @Override
public InputStream next() {
if (!valid) throw new IllegalStateException();
@@ -322,7 +315,6 @@ public class ModelledResourceManagerImpl
};
}
- @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java?rev=1204705&r1=1204704&r2=1204705&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java (original)
+++ aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/impl/ModellingHelperImpl.java Mon Nov 21 21:08:35 2011
@@ -53,26 +53,20 @@ public class ModellingHelperImpl impleme
private static final Logger logger = LoggerFactory.getLogger(ModellingHelperImpl.class);
- @Override
public boolean areMandatoryAttributesPresent(
Map<String, String> consumerAttributes, Provider p) {
return areMandatoryAttributesPresent_(consumerAttributes, p);
}
-
- @Override
public ImportedBundle buildFragmentHost(String fragmentHostHeader)
throws InvalidAttributeException {
return buildFragmentHost_(fragmentHostHeader);
}
-
- @Override
public ImportedPackage intersectPackage(ImportedPackage p1, ImportedPackage p2) {
return intersectPackage_(p1, p2);
}
- @Override
public DeployedBundles createDeployedBundles(String assetName,
Collection<ImportedBundle> appContentNames,
Collection<ImportedBundle> appUseBundleNames,
Modified: aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java?rev=1204705&r1=1204704&r2=1204705&view=diff
==============================================================================
--- aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java (original)
+++ aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ApplicationMetadataImpl.java Mon Nov 21 21:08:35 2011
@@ -162,50 +162,42 @@ public final class ApplicationMetadataIm
return props;
}
- @Override
-public List<Content> getApplicationContents()
+ public List<Content> getApplicationContents()
{
return Collections.unmodifiableList(this.appContents);
}
- @Override
-public List<ServiceDeclaration> getApplicationExportServices()
+ public List<ServiceDeclaration> getApplicationExportServices()
{
return Collections.unmodifiableList(this.exportServices);
}
- @Override
-public List<ServiceDeclaration> getApplicationImportServices()
+ public List<ServiceDeclaration> getApplicationImportServices()
{
return Collections.unmodifiableList(this.importServices);
}
- @Override
-public String getApplicationSymbolicName()
+ public String getApplicationSymbolicName()
{
return this.appSymbolicName;
}
- @Override
-public Version getApplicationVersion()
+ public Version getApplicationVersion()
{
return this.appVersion;
}
- @Override
-public String getApplicationName()
+ public String getApplicationName()
{
return this.appName;
}
- @Override
-public String getApplicationScope()
+ public String getApplicationScope()
{
return appScope;
}
- @Override
-public boolean equals(Object other)
+ public boolean equals(Object other)
{
if (other == this) return true;
if (other == null) return false;
@@ -222,15 +214,13 @@ public int hashCode()
return appScope.hashCode();
}
- @Override
-public void store(File f) throws IOException {
+ public void store(File f) throws IOException {
FileOutputStream fos = new FileOutputStream (f);
store(fos);
fos.close();
}
- @Override
-public void store(OutputStream out) throws IOException {
+ public void store(OutputStream out) throws IOException {
if (manifest != null) {
Attributes att = manifest.getMainAttributes();
if ((att.getValue(Attributes.Name.MANIFEST_VERSION.toString())) == null) {
@@ -240,8 +230,7 @@ public void store(OutputStream out) thro
}
}
- @Override
-public Collection<Content> getUseBundles()
+ public Collection<Content> getUseBundles()
{
return this.useBundle;
}
Modified: aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentContentImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentContentImpl.java?rev=1204705&r1=1204704&r2=1204705&view=diff
==============================================================================
--- aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentContentImpl.java (original)
+++ aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentContentImpl.java Mon Nov 21 21:08:35 2011
@@ -54,38 +54,31 @@ public final class DeploymentContentImpl
_content = new ContentImpl (deployedContent);
}
- @Override
-public Version getExactVersion() {
+ public Version getExactVersion() {
return getVersion().getExactVersion();
}
- @Override
-public String getAttribute(String key) {
+ public String getAttribute(String key) {
return _content.getAttribute(key);
}
- @Override
-public Map<String, String> getAttributes() {
+ public Map<String, String> getAttributes() {
return _content.getAttributes();
}
- @Override
-public String getContentName() {
+ public String getContentName() {
return _content.getContentName();
}
- @Override
-public String getDirective(String key) {
+ public String getDirective(String key) {
return _content.getDirective(key);
}
- @Override
-public Map<String, String> getDirectives() {
+ public Map<String, String> getDirectives() {
return _content.getDirectives();
}
- @Override
-public VersionRange getVersion() {
+ public VersionRange getVersion() {
String deployedVersion = _content.getAttribute(AppConstants.DEPLOYMENT_BUNDLE_VERSION);
VersionRange vr = null;
if (deployedVersion != null && deployedVersion.length() > 0) {
@@ -107,13 +100,11 @@ public VersionRange getVersion() {
}
}
- @Override
-public int hashCode() {
+ public int hashCode() {
return _content.hashCode();
}
- @Override
-public Map<String, String> getNameValueMap() {
+ public Map<String, String> getNameValueMap() {
return _content.getNameValueMap();
}