Changeset 265:ca81a87a1311

Timestamp:

08/27/11 00:47:05 (5 months ago)

Author:

stania

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2699

Message:

moved setKrakenSystemProperties to kraken-api.
kraken-api version up (1.8.0)

Files:

• kraken-api/pom.xml (modified) (1 diff)
• kraken-api/src/main/java/org/krakenapps/api/Environment.java (added)
• kraken-ca/pom.xml (modified) (2 diffs)
• kraken-ca/src/test/java/org/krakenapps/ca/ClientCAUsageTest.java (modified) (1 diff)
• kraken-core/pom.xml (modified) (1 diff)
• kraken-core/src/main/java/org/krakenapps/main/Kraken.java (modified) (3 diffs)
• kraken-dom/pom.xml (modified) (1 diff)

kraken-api/pom.xml

@@ -10 +10 @@
         <artifactId>kraken-api</artifactId>
         <name>Kraken API</name>
-        <version>1.7.7</version>
+        <version>1.8.0</version>
         <url>http://maven.apache.org</url>
 </project>

kraken-ca/pom.xml

@@ -58 +58 @@
                         <groupId>org.krakenapps</groupId>
                         <artifactId>kraken-api</artifactId>
-                        <version>1.7.7</version>
+                        <version>1.8.0</version>
                 </dependency>
                 <dependency>
@@ -81 +81 @@
                         <optional>true</optional>
                 </dependency>
-                <dependency>
-                        <groupId>org.krakenapps</groupId>
-                        <artifactId>kraken-core</artifactId>
-                        <version>1.7.8</version>
-                        <scope>test</scope>
-                </dependency>
         </dependencies>
 </project>

kraken-ca/src/test/java/org/krakenapps/ca/ClientCAUsageTest.java

@@ -42 +42 @@
 import javax.crypto.spec.PBEParameterSpec;
 
+import org.krakenapps.api.Environment;
 import org.krakenapps.ca.impl.CertificateAuthorityImpl;
-import org.krakenapps.main.Kraken;
 
 public class ClientCAUsageTest {
         public void PrimaryTest() throws IOException {
-                Kraken.setKrakenSystemProperties();
+                Environment.setKrakenSystemProperties(".");
 
                 // TODO: check prerequisite - kraken.data.dir, CA file exists?

kraken-core/pom.xml

@@ -37 +37 @@
                         <groupId>org.krakenapps</groupId>
                         <artifactId>kraken-api</artifactId>
-                        <version>1.7.7</version>
+                        <version>1.8.0</version>
                 </dependency>
                 <dependency>

kraken-core/src/main/java/org/krakenapps/main/Kraken.java

@@ -49 +49 @@
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
 import org.krakenapps.account.AccountScriptFactory;
+import org.krakenapps.api.Environment;
 import org.krakenapps.api.InstrumentationService;
 import org.krakenapps.api.LoggerControlService;
@@ -174 +175 @@
         }
 
-        public static void setKrakenSystemProperties() {
-                if (System.getProperty("kraken.dir") == null) {
-                        File jarPath = new File(Kraken.class.getProtectionDomain().getCodeSource().getLocation().getPath());
-                        File dir = jarPath.getParentFile();
-                        System.setProperty("kraken.dir", dir.getAbsolutePath());
-                }
-
-                String krakenDir = System.getProperty("kraken.dir");
-                if (System.getProperty("kraken.data.dir") == null)
-                        System.setProperty("kraken.data.dir", new File(krakenDir, "data").getAbsolutePath());
-                if (System.getProperty("kraken.log.dir") == null)
-                        System.setProperty("kraken.log.dir", new File(krakenDir, "log").getAbsolutePath());
-                if (System.getProperty("kraken.cache.dir") == null)
-                        System.setProperty("kraken.cache.dir", new File(krakenDir, "cache").getAbsolutePath());
-                if (System.getProperty("kraken.download.dir") == null)
-                        System.setProperty("kraken.download.dir", new File(krakenDir, "download").getAbsolutePath());
-        }
-
         /**
          * Boot felix framework up.
@@ -201 +184 @@
         @SuppressWarnings({ "unchecked", "rawtypes" })
         public void boot(StartOptions startOptions) throws Exception {
-                setKrakenSystemProperties();
+                File jarPath = new File(Kraken.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+                File dir = jarPath.getParentFile();
+
+                Environment.setKrakenSystemProperties(dir.getAbsolutePath());
 
                 setLogger();

kraken-dom/pom.xml

@@ -68 +68 @@
                         <groupId>org.krakenapps</groupId>
                         <artifactId>kraken-api</artifactId>
-                        <version>1.7.0</version>
+                        <version>1.8.0</version>
                 </dependency>
                 <dependency>