You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2009/12/31 18:24:10 UTC
svn commit: r894896 - in
/incubator/aries/trunk/application/application-utils/src/main:
java/org/apache/aries/application/impl/
java/org/apache/aries/application/utils/ resources/OSGI-INF/blueprint/
Author: mnuttall
Date: Thu Dec 31 17:24:09 2009
New Revision: 894896
URL: http://svn.apache.org/viewvc?rev=894896&view=rev
Log:
ARIES-89: Implement application support: More work on AriesApplicationManager.createApplication
Added:
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml
- copied, changed from r894625, incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-manager.xml
Removed:
incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-manager.xml
Modified:
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ServiceDeclarationImpl.java
incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java
Added: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java?rev=894896&view=auto
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java (added)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java Thu Dec 31 17:24:09 2009
@@ -0,0 +1,41 @@
+/*
+ * 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 WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.aries.application.impl;
+
+import java.util.Set;
+import java.util.jar.Manifest;
+
+import org.apache.aries.application.ApplicationMetadata;
+import org.apache.aries.application.DeploymentMetadata;
+import org.apache.aries.application.DeploymentMetadataFactory;
+import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.BundleInfo;
+
+public class DeploymentMetadataFactoryImpl implements DeploymentMetadataFactory {
+
+ public DeploymentMetadata createDeploymentMetadata(AriesApplication app,
+ Set<BundleInfo> bundleInfo) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+}
Added: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java?rev=894896&view=auto
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java (added)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java Thu Dec 31 17:24:09 2009
@@ -0,0 +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 WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.aries.application.impl;
+
+import java.util.List;
+
+import org.apache.aries.application.ApplicationMetadata;
+import org.apache.aries.application.DeploymentContent;
+import org.apache.aries.application.DeploymentMetadata;
+import org.osgi.framework.Version;
+
+public class DeploymentMetadataImpl implements DeploymentMetadata {
+
+ public List<DeploymentContent> getApplicationDeploymentContents() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ApplicationMetadata getApplicationMetadata() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getApplicationSymbolicName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Version getApplicationVersion() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ServiceDeclarationImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ServiceDeclarationImpl.java?rev=894896&r1=894895&r2=894896&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ServiceDeclarationImpl.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/ServiceDeclarationImpl.java Thu Dec 31 17:24:09 2009
@@ -38,7 +38,7 @@
/**
* construct the ServiceDeclaration from the service string
- * @param service the service string value of Import-Services or Export-Services header
+ * @param service A single service string value from the Import-Services or Export-Services header
* @throws InvalidSyntaxException
*/
public ServiceDeclarationImpl(String service) throws InvalidSyntaxException
Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java?rev=894896&r1=894895&r2=894896&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java (original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/AppConstants.java Thu Dec 31 17:24:09 2009
@@ -20,7 +20,7 @@
/**
- * Constants for this bundle
+ * Widely used constants in parsing Aries applications
*/
public interface AppConstants
{
@@ -41,6 +41,16 @@
public static final String DEFAULT_VERSION = "0.0.0";
/** The name of the application manifest in the application */
public static final String APPLICATION_MF = "META-INF/APPLICATION.MF";
-
+ /** The name of the deployment manifest in the application */
+ public static final String DEPLOYMENT_MF = "META-INF/DEPLOYMENT.MF";
+ /** The name of the META-INF directory */
+ public static final String META_INF = "META-INF";
+ /** The name of an application.xml file which will be used in processing legacy .war files */
+ public static final String APPLICATION_XML = "META-INF/application.xml";
+ /** The expected lower case suffix of a jar file */
+ public static final String LOWER_CASE_JAR_SUFFIX = ".jar";
+ /** The expected lower case suffix of a war file */
+ public static final String LOWER_CASE_WAR_SUFFIX = ".war";
+
public static final String MANIFEST_VERSION="1.0";
}
Copied: incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml (from r894625, incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-manager.xml)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml?p2=incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml&p1=incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-manager.xml&r1=894625&r2=894896&rev=894896&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-manager.xml (original)
+++ incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml Thu Dec 31 17:24:09 2009
@@ -26,4 +26,8 @@
</bean>
<service interface="org.apache.aries.application.ApplicationMetadataManager" ref="manager-service" />
+
+ <bean id="deploymentMf-factory" class="org.apache.aries.application.impl.DeploymentMetadataFactoryImpl" />
+ <service interface="org.apache.aries.application.DeploymentMetadataFactory" ref="deploymentMf-factory" />
+
</blueprint>