Author: [email protected]
Date: Fri Jun 1 11:08:19 2012
New Revision: 2423
Log:
1.0.0-RC4 upgrade and small fixes
Modified:
trunk/amdatu-ams-populator/pom.xml
trunk/amdatu-ams-populator/src/main/java/org/amdatu/ams/populator/AmsFeature.java
Modified: trunk/amdatu-ams-populator/pom.xml
==============================================================================
--- trunk/amdatu-ams-populator/pom.xml (original)
+++ trunk/amdatu-ams-populator/pom.xml Fri Jun 1 11:08:19 2012
@@ -28,7 +28,7 @@
<name>Amdatu Development - AMS populator</name>
<properties>
- <org.amdatu.ace.version>1.0.0-RC3</org.amdatu.ace.version>
+ <org.amdatu.ace.version>1.0.0-RC4</org.amdatu.ace.version>
</properties>
<repositories>
Modified:
trunk/amdatu-ams-populator/src/main/java/org/amdatu/ams/populator/AmsFeature.java
==============================================================================
---
trunk/amdatu-ams-populator/src/main/java/org/amdatu/ams/populator/AmsFeature.java
(original)
+++
trunk/amdatu-ams-populator/src/main/java/org/amdatu/ams/populator/AmsFeature.java
Fri Jun 1 11:08:19 2012
@@ -146,7 +146,8 @@
jar = new JarInputStream(new FileInputStream(file));
Attributes attr = jar.getManifest().getMainAttributes();
String symbolicName = attr.getValue(Constants.BUNDLE_SYMBOLICNAME);
-
+ m_symbolicNames.add(attr.getValue(Constants.BUNDLE_SYMBOLICNAME));
+
// Only upload the artifact if no artifact with this symbolic name
already exists
if (!AmsUtil.resourceExists(m_workspace, Artifact.class,
Constants.BUNDLE_SYMBOLICNAME, symbolicName)) {
ArtifactBuilder builder = new ArtifactBuilder()
@@ -161,7 +162,7 @@
if (conf != null) {
builder.setAttribute(DEPLOYMENT_PROVIDES_RESOURCE_PROCESSOR, conf);
}
-
m_symbolicNames.add(attr.getValue(Constants.BUNDLE_SYMBOLICNAME));
+
Artifact artifact = builder.build();
m_workspace.createResource(artifact);
}
@@ -177,7 +178,8 @@
String fileName =
file.getName().substring(file.getName().lastIndexOf('/') + 1);
String name = "config " + fileName.substring(0,
Math.min(fileName.lastIndexOf('.'), fileName.length()));
String configFileName = file.getName();
-
+ m_configNames.add(file.getName());
+
// Only upload the config if no such config exists yet
if (!AmsUtil.resourceExists(m_workspace, Artifact.class,
Artifact.ATTR_CONFIG_FILENAME, configFileName)) {
ArtifactBuilder builder =
@@ -187,7 +189,6 @@
.setConfigFileName(configFileName)
.setName(name)
.setProcessorPid(CONFIG_PROCESSOR_ID);
- m_configNames.add(file.getName());
Artifact artifact = builder.build();
m_workspace.createResource(artifact);
}
@@ -197,7 +198,8 @@
String fileName =
file.getName().substring(file.getName().lastIndexOf('/') + 1);
String configFileName = file.getName();
String name = "tenant " + fileName.substring(0,
Math.min(fileName.lastIndexOf('.'), fileName.length()));
-
+ m_configNames.add(file.getName());
+
// Only upload the config if no such config exists yet
if (!AmsUtil.resourceExists(m_workspace, Artifact.class,
Artifact.ATTR_CONFIG_FILENAME, configFileName)) {
ArtifactBuilder builder =
@@ -209,7 +211,7 @@
.setProcessorPid(TENANT_PROCESSOR_ID);
builder.setAttribute("mimetype",
"application/vnd.amdatu.tenantconf");
builder.setAttribute(TENANT_PID_KEY, getTenantPid(file));
- m_configNames.add(file.getName());
+
Artifact artifact = builder.build();
m_workspace.createResource(artifact);
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
