Author: mir
Date: Tue Jan 12 15:32:12 2010
New Revision: 898368
URL: http://svn.apache.org/viewvc?rev=898368&view=rev
Log:
CLEREZZA-60: issue closed. moved CLEREZZA-60 to trunk.
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/
- copied from r898359,
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/
Removed:
incubator/clerezza/issues/CLEREZZA-60/org.apache.clerezza.platform.concepts/
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/pom.xml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java?rev=898368&r1=898367&r2=898368&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
Tue Jan 12 15:32:12 2010
@@ -189,7 +189,6 @@
}
public static void main(String... args) throws IOException {
-
LauncherArguments arguments;
try {
final ArgumentHandler argumentHandler = new
ArgumentHandler(args);
@@ -212,7 +211,6 @@
showUsage();
return;
}
-
Policy.setPolicy(new Policy() {
@Override
@@ -223,20 +221,15 @@
}
});
System.setSecurityManager(new SecurityManager());
-
Properties configProps = getConfigProps(arguments);
try {
Felix m_felix = new Felix(configProps);
-
System.out.println("starting felix");
m_felix.start();
final PathNode bundlesRoot =
PathNodeFactory.getPathNode(Main.class.getResource("/bundles"));
final BundleContext bundleContext =
m_felix.getBundleContext();
final String revertParam = arguments.getRevertParam();
installBundlesForStartLevels(bundleContext,
bundlesRoot, revertParam);
-
-
-
} catch (Exception ex) {
System.err.println("Could not create framework: " + ex);
ex.printStackTrace();
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml?rev=898368&r1=898359&r2=898368&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/pom.xml
Tue Jan 12 15:32:12 2010
@@ -40,10 +40,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.web.fileserver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId>
</dependency>
<dependency>
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/pom.xml?rev=898368&r1=898367&r2=898368&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/pom.xml
Tue Jan 12 15:32:12 2010
@@ -14,7 +14,8 @@
<description>The direct or indirect parent of Clerezza Artifacts
exposing web service</description>
<modules>
<module>org.apache.clerezza.platform.accountcontrolpanel</module>
- <module>org.apache.clerezza.platform.content</module>
+ <module>org.apache.clerezza.platform.concepts</module>
+ <module>org.apache.clerezza.platform.content</module>
<module>org.apache.clerezza.platform.content.representations</module>
<module>org.apache.clerezza.platform.dashboard</module>
<module>org.apache.clerezza.platform.documentation.viewer</module>
@@ -53,4 +54,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
