ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1465922 [3/3] - in /ace/trunk: build/ org.apache.ace.authentication.itest/ org.apache.ace.authentication.itest/src/org/apache/ace/it/authentication/ org.apache.ace.client.repository.itest/ org.apache.ace.client.repository.itest/src/org/apa...
Date Tue, 09 Apr 2013 08:12:36 GMT
Added: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
(added)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/RepositoryReplicationTask.java
Tue Apr  9 08:12:33 2013
@@ -0,0 +1,113 @@
+/*
+ * 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 WARRANTIES OR 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.ace.repository.task;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.ace.connectionfactory.ConnectionFactory;
+import org.apache.ace.discovery.Discovery;
+import org.apache.ace.range.RangeIterator;
+import org.apache.ace.range.SortedRangeSet;
+import org.apache.ace.repository.RepositoryReplication;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+
+/**
+ * Repository replication task. Uses discovery to find the server it talks to.
+ * Subsequently it checks which local repositories are configured and tries to
+ * synchronize them with remote copies. Only pulls stuff in, it does not push
+ * stuff out.
+ */
+public class RepositoryReplicationTask implements Runnable {
+    private volatile BundleContext m_context;
+    private volatile Discovery m_discovery;
+    private volatile ConnectionFactory m_connectionFactory;
+    private volatile LogService m_log;
+
+    public void run() {
+        try {
+            ServiceReference[] refs = m_context.getServiceReferences(RepositoryReplication.class.getName(),
null);
+            if (refs == null) {
+                return;
+            }
+
+            for (ServiceReference ref : refs) {
+                RepositoryReplication repository = (RepositoryReplication) m_context.getService(ref);
+
+                try {
+                    String filter = getQueryFilter(ref);
+                    URL host = m_discovery.discover();
+                    URL query = new URL(host, "/replication/query?" + filter);
+
+                    HttpURLConnection connection = (HttpURLConnection) m_connectionFactory.createConnection(query);
+
+                    if (connection.getResponseCode() == HttpServletResponse.SC_OK) {
+                        SortedRangeSet localRange = repository.getRange();
+
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                        try {
+                            String line = reader.readLine();
+                            int i = line.lastIndexOf(',');
+                            if (i > 0) {
+                                SortedRangeSet remoteRange = new SortedRangeSet(line.substring(i
+ 1));
+                                SortedRangeSet delta = localRange.diffDest(remoteRange);
+                                RangeIterator iterator = delta.iterator();
+
+                                while (iterator.hasNext()) {
+                                    long version = iterator.next();
+                                    URL get = new URL(host, "/replication/get?" + filter
+ "&version=" + version);
+                                    
+                                    HttpURLConnection connection2 = (HttpURLConnection) m_connectionFactory.createConnection(get);
+
+                                    repository.put(connection2.getInputStream(), version);
+                                }
+                            }
+                        }
+                        catch (Exception e) {
+                            m_log.log(LogService.LOG_WARNING, "Error parsing remote range",
e);
+                        }
+                    }
+                    else {
+                        m_log.log(LogService.LOG_WARNING, "Could not sync repository for
customer: " + ref.getProperty("customer") + ", name: " + ref.getProperty("name") + ", because:
" + connection.getResponseMessage() + " (" + connection.getResponseCode() + ")");
+                    }
+                }
+                finally {
+                    m_context.ungetService(ref);
+                }
+            }
+        }
+        catch (Exception e) {
+            m_log.log(LogService.LOG_WARNING, "Error while replicating", e);
+        }
+    }
+
+    /**
+     * @param ref
+     * @return
+     */
+    public String getQueryFilter(ServiceReference ref) {
+        return "customer=" + ref.getProperty("customer") + "&name=" + ref.getProperty("name");
+    }
+}
\ No newline at end of file

Added: ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/packageinfo
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/packageinfo?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/packageinfo (added)
+++ ace/trunk/org.apache.ace.repository/src/org/apache/ace/repository/task/packageinfo Tue
Apr  9 08:12:33 2013
@@ -0,0 +1 @@
+version 1.0
\ No newline at end of file

Added: ace/trunk/org.apache.ace.repository/task.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/task.bnd?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/task.bnd (added)
+++ ace/trunk/org.apache.ace.repository/task.bnd Tue Apr  9 08:12:33 2013
@@ -0,0 +1,3 @@
+Bundle-Activator: org.apache.ace.repository.task.Activator
+Export-Package: org.apache.ace.repository.task
+Bundle-Version: 1.0.0

Added: ace/trunk/org.apache.ace.repository/test/org/apache/ace/repository/impl/RepositoryImplTest.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository/test/org/apache/ace/repository/impl/RepositoryImplTest.java?rev=1465922&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.repository/test/org/apache/ace/repository/impl/RepositoryImplTest.java
(added)
+++ ace/trunk/org.apache.ace.repository/test/org/apache/ace/repository/impl/RepositoryImplTest.java
Tue Apr  9 08:12:33 2013
@@ -0,0 +1,132 @@
+/*
+ * 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 WARRANTIES OR 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.ace.repository.impl;
+
+import static org.apache.ace.test.utils.TestUtils.UNIT;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class RepositoryImplTest {
+
+    private RepositoryImpl m_repo;
+    private File m_baseDir;
+
+    @BeforeMethod(alwaysRun = true)
+    protected void setUp() throws IOException {
+        m_baseDir = File.createTempFile("repo", null);
+        m_baseDir.delete();
+        m_baseDir.mkdirs();
+        m_repo = new RepositoryImpl(new File(m_baseDir, "data"), new File(m_baseDir, "tmp"),
true);
+    }
+
+    @Test(groups = { UNIT })
+    public void testGetAndPut() throws Exception {
+        InputStream data = new ByteArrayInputStream("abc".getBytes());
+        boolean result = m_repo.put(data, 1);
+        assert result : "Put should have succeeded.";
+
+        File file = new File(m_baseDir, "data" + File.separator + "1");
+        BufferedReader reader = new BufferedReader(new FileReader(file));
+        assert "abc".equals(reader.readLine()) : "File " + file.getAbsolutePath() + " should
have contained 'abc'.";
+
+        assert !m_repo.put(data, 1) : "Putting an existing version should return false.";
+
+        InputStream in = m_repo.get(1);
+        reader = new BufferedReader(new InputStreamReader(in));
+        assert "abc".equals(reader.readLine()) : "'get'ting version 1 should have returned
an inputstream containing 'abc'";
+        assert null == m_repo.get(2) : "'get'ting a non-existing version should return null";
+    }
+
+    @Test(groups = { UNIT }, expectedExceptions = {IllegalArgumentException.class})
+    public void testPutNegative() throws Exception {
+        m_repo.put(new ByteArrayInputStream("abc".getBytes()), -1);
+    }
+
+    @Test(groups = { UNIT }, expectedExceptions = {IllegalArgumentException.class})
+    public void testPutZero() throws Exception {
+        m_repo.put(new ByteArrayInputStream("abc".getBytes()), 0);
+    }
+
+    @Test(groups = { UNIT }, expectedExceptions = {IllegalArgumentException.class})
+    public void testGetNegative() throws Exception {
+        m_repo.get(-1);
+    }
+
+    @Test(groups = { UNIT }, expectedExceptions = {IllegalArgumentException.class})
+    public void testGetZero() throws Exception {
+        m_repo.get(0);
+    }
+
+    @Test(groups = { UNIT })
+    public void testCommitAndCheckout() throws Exception {
+        InputStream data = new ByteArrayInputStream("abc".getBytes());
+        boolean result = m_repo.commit(data, 1);
+        assert !result : "Commit with incorrect 'base' number should have failed.";
+
+        result = m_repo.commit(data, 0);
+        assert result : "Commit should have succeeded";
+
+        File file = new File(m_baseDir, "data" + File.separator + "1");
+        BufferedReader reader = new BufferedReader(new FileReader(file));
+        assert "abc".equals(reader.readLine()) : "File " + file.getAbsolutePath() + " should
have contained 'abc'.";
+
+        assert !m_repo.commit(data, 0) : "Committing an existing version should return false.";
+        assert !m_repo.commit(data, 999) : "Committing should only succeed if the base number
equals the highest version inside the repository";
+
+        InputStream in = m_repo.checkout(1);
+        reader = new BufferedReader(new InputStreamReader(in));
+        assert "abc".equals(reader.readLine()) : "Checking out version 1 should have returned
an inputstream containing 'abc'";
+        assert null == m_repo.get(2) : "Checking out a non-existing version should return
null";
+    }
+
+    @Test(groups = { UNIT }, expectedExceptions = {IllegalArgumentException.class})
+    public void testCommitNegative() throws Exception {
+        m_repo.commit(new ByteArrayInputStream("abc".getBytes()), -1);
+    }
+
+    @Test(groups = { UNIT }, expectedExceptions = {IllegalArgumentException.class})
+    public void testCheckoutNegative() throws Exception {
+        m_repo.checkout(-1);
+    }
+
+    @Test(groups = { UNIT }, expectedExceptions = {IllegalArgumentException.class})
+    public void testCheckoutZero() throws Exception {
+        m_repo.checkout(0);
+    }
+
+    @Test(groups = { UNIT }, expectedExceptions = {IllegalStateException.class})
+    public void testUpdated() throws Exception {
+        m_repo.updated(false);
+        assert !m_repo.commit(new ByteArrayInputStream("abc".getBytes()), 0) : "Committing
should not be allowed on slave repositories.";
+        assert m_repo.put(new ByteArrayInputStream("abc".getBytes()), 1) : "'put'ting a replica
should be allowed on slave repositories.";
+        File file = new File(m_baseDir, "newLocation" + File.separator + "1");
+        BufferedReader reader = new BufferedReader(new FileReader(file));
+        assert "abc".equals(reader.readLine()) : "File " + file.getAbsolutePath() + " should
have contained 'abc'.";
+    }
+
+}
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.useradmin.ui.itest/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -2,70 +2,72 @@ Test-Cases: ${classes;CONCRETE;EXTENDS;o
 Private-Package: org.apache.ace.useradmin.ui.test
 -runvm: -ea
 -runfw: org.apache.felix.framework
--runbundles: org.apache.felix.dependencymanager,\
-	org.apache.felix.useradmin,\
-	org.apache.felix.useradmin.filestore,\
-	org.apache.felix.log,\
-	org.apache.felix.prefs,\
+-runbundles: \
+	osgi.cmpn,\
+	com.vaadin,\
 	org.apache.felix.configadmin,\
+	org.apache.felix.dependencymanager,\
+	org.apache.felix.dependencymanager.shell,\
 	org.apache.felix.eventadmin,\
+	org.apache.felix.gogo.command,\
 	org.apache.felix.gogo.runtime,\
 	org.apache.felix.gogo.shell,\
-	org.apache.felix.gogo.command,\
 	org.apache.felix.http.jetty,\
-	org.apache.felix.dependencymanager.shell,\
-	osgi.cmpn,\
-	com.vaadin,\
-	org.apache.ace.configurator.useradmin.task;version=latest,\
-	org.apache.ace.target.mgmt.ui;version=latest,\
-	org.apache.ace.log.servlet;version=latest,\
-	org.apache.ace.deployment.streamgenerator;version=latest,\
+	org.apache.felix.log,\
+	org.apache.felix.prefs,\
+	org.apache.felix.useradmin,\
+	org.apache.felix.useradmin.filestore,\
 	org.apache.ace.authentication.api;version=latest,\
-	org.apache.ace.client.repository.impl;version=latest,\
-	org.apache.ace.tageditor;version=latest,\
-	org.apache.ace.client.repository.helper.bundle;version=latest,\
-	org.apache.ace.discovery.api;version=latest,\
-	org.apache.ace.client.rest;version=latest,\
-	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.authentication.impl;version=latest,\
 	org.apache.ace.authentication.processor.password;version=latest,\
-	org.apache.ace.webui.vaadin;version=latest,\
-	org.apache.ace.resourceprocessor.useradmin;version=latest,\
-	org.apache.ace.server.log.ui;version=latest,\
-	org.apache.ace.deployment.verifier.ui;version=latest,\
-	org.apache.ace.repository.api;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
-	org.apache.ace.server.log.store.filelogstore;version=latest,\
+	org.apache.ace.authentication.processor.basicauth;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
-	org.apache.ace.obr.storage;version=latest,\
+	org.apache.ace.client.repository.helper.base;version=latest,\
+	org.apache.ace.client.repository.helper.bundle;version=latest,\
 	org.apache.ace.client.repository.helper.configuration;version=latest,\
+	org.apache.ace.client.repository.impl;version=latest,\
+	org.apache.ace.client.rest;version=latest,\
+	org.apache.ace.configurator.serveruseradmin;version=latest,\
+	org.apache.ace.configurator.useradmin.task;version=latest,\
+	org.apache.ace.configurator;version=latest,\
+	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.consolelogger;version=latest,\
-	org.apache.ace.httplistener;version=latest,\
-	org.apache.ace.obr.servlet;version=latest,\
-	org.apache.ace.nodelauncher.api;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
+	org.apache.ace.deployment.provider.repositorybased;version=latest,\
 	org.apache.ace.deployment.servlet;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
-	org.apache.ace.obr.metadata;version=latest,\
-	org.apache.ace.configurator;version=latest,\
-	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.authentication.impl;version=latest,\
+	org.apache.ace.deployment.streamgenerator;version=latest,\
+	org.apache.ace.verifier.ui;version=latest,\
+	org.apache.ace.verifier.impl;version=latest,\
+	org.apache.ace.discovery.api;version=latest,\
+	org.apache.ace.httplistener;version=latest,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.server.servlet;version=latest,\
 	org.apache.ace.nodelauncher.amazon;version=latest,\
-	org.apache.ace.configurator.serveruseradmin;version=latest,\
-	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.deployment.provider.repositorybased;version=latest,\
-	org.apache.ace.deployment.verifier;version=latest,\
-	org.apache.ace.client.repository.helper.base;version=latest,\
-	org.apache.ace.authenticationprocessor.basicauth;version=latest,\
+	org.apache.ace.nodelauncher.api;version=latest,\
 	org.apache.ace.nodelauncher.ui;version=latest,\
+	org.apache.ace.obr.metadata;version=latest,\
+	org.apache.ace.obr.servlet;version=latest,\
+	org.apache.ace.obr.storage;version=latest,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.repository.api;version=latest,\
+	org.apache.ace.repository.impl;version=latest,\
+	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.resourceprocessor.useradmin;version=latest,\
+	org.apache.ace.scheduler.impl;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.file;version=latest,\
+	org.apache.ace.log.server.ui;version=latest,\
+	org.apache.ace.tageditor;version=latest,\
+	org.apache.ace.target.mgmt.ui;version=latest,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.useradmin.ui;version=latest,\
-	org.apache.ace.test;version=latest
+	org.apache.ace.webui.vaadin;version=latest
 -buildpath: osgi.core;version='[4.1,5)',\
 	osgi.cmpn,\
 	junit.osgi,\
 	org.mockito.mockito-all,\
 	org.apache.felix.dependencymanager,\
+	org.apache.ace.test;version=latest,\
 	org.apache.ace.useradmin.ui;version=latest
 -runsystempackages: sun.reflect
 -runproperties: org.apache.felix.log.storeDebug=true,\

Modified: ace/trunk/org.apache.ace.verifier/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.verifier/bnd.bnd?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.verifier/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.verifier/bnd.bnd Tue Apr  9 08:12:33 2013
@@ -17,6 +17,6 @@
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
 	org.apache.ace.test;version=latest,\
-	org.apache.ace.gateway.log.store;version=latest,\
+	org.apache.ace.log.target.store.impl;version=latest,\
 	org.apache.ace.webui.vaadin;version=latest
 -sub: *.bnd

Modified: ace/trunk/run-client/client.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/client.bndrun?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/run-client/client.bndrun (original)
+++ ace/trunk/run-client/client.bndrun Tue Apr  9 08:12:33 2013
@@ -29,14 +29,13 @@
 	org.apache.ace.configurator;version=latest,\
 	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.consolelogger;version=latest,\
-	org.apache.ace.deployment.verifier.ui;version=latest,\
-	org.apache.ace.deployment.verifier;version=latest,\
+	org.apache.ace.verifier.ui;version=latest,\
+	org.apache.ace.verifier.impl;version=latest,\
 	org.apache.ace.discovery.api;version=latest,\
 	org.apache.ace.discovery.property;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
-	org.apache.ace.log.servlet;version=latest,\
-	org.apache.ace.log.task;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.server.task;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.nodelauncher.amazon;version=latest,\
 	org.apache.ace.nodelauncher.api;version=latest,\
 	org.apache.ace.nodelauncher.ui;version=latest,\
@@ -44,10 +43,10 @@
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.resourceprocessor.useradmin;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
-	org.apache.ace.server.log.store.filelogstore;version=latest,\
-	org.apache.ace.server.log.ui;version=latest,\
+	org.apache.ace.scheduler.impl;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.file;version=latest,\
+	org.apache.ace.log.server.ui;version=latest,\
 	org.apache.ace.tageditor;version=latest,\
 	org.apache.ace.target.mgmt.ui;version=latest,\
 	org.apache.ace.useradmin.ui;version=latest,\

Modified: ace/trunk/run-client/conf/org.apache.ace.scheduler.cfg
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/conf/org.apache.ace.scheduler.cfg?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/run-client/conf/org.apache.ace.scheduler.cfg (original)
+++ ace/trunk/run-client/conf/org.apache.ace.scheduler.cfg Tue Apr  9 08:12:33 2013
@@ -1,3 +1,3 @@
 auditlog = 2000
 org.apache.ace.configurator.useradmin.task.UpdateUserAdminTask = 2000
-org.apache.ace.server.log.task.LogSyncTask = 2000
+org.apache.ace.log.server.task.LogSyncTask = 2000

Modified: ace/trunk/run-server-allinone/server-allinone.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/server-allinone.bndrun?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/server-allinone.bndrun (original)
+++ ace/trunk/run-server-allinone/server-allinone.bndrun Tue Apr  9 08:12:33 2013
@@ -1,63 +1,63 @@
 -runfw: org.apache.felix.framework;version='[4,5)'
 -runee: JavaSE-1.6
--runbundles: org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
-	org.apache.felix.useradmin;version='[1.0.2,1.0.3)',\
-	org.apache.felix.useradmin.filestore;version='[1.0.1,1.0.2)',\
-	org.apache.felix.log;version='[1.0.1,1.0.2)',\
-	org.apache.felix.prefs;version='[1.0.4,1.0.5)',\
-	org.apache.felix.configadmin;version='[1.4.0,1.4.1)',\
-	org.apache.felix.eventadmin;version='[1.2.14,1.2.15)',\
-	org.apache.felix.gogo.runtime;version='[0.10.0,0.10.1)',\
-	org.apache.felix.gogo.shell;version='[0.10.0,0.10.1)',\
-	org.apache.felix.gogo.command;version='[0.12.0,0.12.1)',\
-	org.apache.felix.http.jetty;version='[2.2.0,2.2.1)',\
-	org.apache.felix.dependencymanager.shell;version='[3.0.1,3.0.2)',\
+-runbundles: org.apache.felix.dependencymanager,\
+	org.apache.felix.useradmin,\
+	org.apache.felix.useradmin.filestore,\
+	org.apache.felix.log,\
+	org.apache.felix.prefs,\
+	org.apache.felix.configadmin,\
+	org.apache.felix.eventadmin,\
+	org.apache.felix.gogo.runtime,\
+	org.apache.felix.gogo.shell,\
+	org.apache.felix.gogo.command,\
+	org.apache.felix.http.jetty,\
+	org.apache.felix.dependencymanager.shell,\
 	osgi.cmpn;version=latest,\
-	com.vaadin;version='[6.8.4,6.8.5)',\
-	org.apache.ace.configurator.useradmin.task;version=latest,\
-	org.apache.ace.target.mgmt.ui;version=latest,\
-	org.apache.ace.log.servlet;version=latest,\
-	org.apache.ace.deployment.streamgenerator;version=latest,\
+	com.vaadin,\
 	org.apache.ace.authentication.api;version=latest,\
-	org.apache.ace.client.repository.impl;version=latest,\
-	org.apache.ace.tageditor;version=latest,\
-	org.apache.ace.client.repository.helper.bundle;version=latest,\
-	org.apache.ace.discovery.api;version=latest,\
-	org.apache.ace.client.rest;version=latest,\
-	org.apache.ace.range.api;version=latest,\
-	org.apache.ace.log;version=latest,\
-	org.apache.ace.authenticationprocessor.password;version=latest,\
-	org.apache.ace.webui.vaadin;version=latest,\
-	org.apache.ace.resourceprocessor.useradmin;version=latest,\
-	org.apache.ace.server.log.ui;version=latest,\
-	org.apache.ace.deployment.verifier.ui;version=latest,\
-	org.apache.ace.repository.api;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
-	org.apache.ace.server.log.store.filelogstore;version=latest,\
+	org.apache.ace.authentication.impl;version=latest,\
+	org.apache.ace.authentication.processor.basicauth;version=latest,\
+	org.apache.ace.authentication.processor.password;version=latest,\
 	org.apache.ace.client.repository.api;version=latest,\
-	org.apache.ace.repository.servlet;version=latest,\
-	org.apache.ace.obr.storage;version=latest,\
+	org.apache.ace.client.repository.helper.base;version=latest,\
+	org.apache.ace.client.repository.helper.bundle;version=latest,\
 	org.apache.ace.client.repository.helper.configuration;version=latest,\
+	org.apache.ace.client.repository.impl;version=latest,\
+	org.apache.ace.client.rest;version=latest,\
+	org.apache.ace.configurator.serveruseradmin;version=latest,\
+	org.apache.ace.configurator.useradmin.task;version=latest,\
+	org.apache.ace.configurator;version=latest,\
+	org.apache.ace.connectionfactory;version=latest,\
 	org.apache.ace.consolelogger;version=latest,\
-	org.apache.ace.httplistener;version=latest,\
-	org.apache.ace.obr.servlet;version=latest,\
-	org.apache.ace.nodelauncher.api;version=latest,\
 	org.apache.ace.deployment.provider.api;version=latest,\
+	org.apache.ace.deployment.provider.repositorybased;version=latest,\
 	org.apache.ace.deployment.servlet;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
-	org.apache.ace.obr.metadata;version=latest,\
-	org.apache.ace.configurator;version=latest,\
-	org.apache.ace.connectionfactory;version=latest,\
-	org.apache.ace.authentication.impl;version=latest,\
+	org.apache.ace.deployment.streamgenerator;version=latest,\
+	org.apache.ace.discovery.api;version=latest,\
+	org.apache.ace.httplistener;version=latest,\
+	org.apache.ace.log.api;version=latest,\
+	org.apache.ace.log.server.servlet;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.file;version=latest,\
+	org.apache.ace.log.server.ui;version=latest,\
 	org.apache.ace.nodelauncher.amazon;version=latest,\
-	org.apache.ace.configurator.serveruseradmin;version=latest,\
-	org.apache.ace.repository.impl;version=latest,\
-	org.apache.ace.deployment.provider.repositorybased;version=latest,\
-	org.apache.ace.deployment.verifier;version=latest,\
-	org.apache.ace.client.repository.helper.base;version=latest,\
-	org.apache.ace.authenticationprocessor.basicauth;version=latest,\
+	org.apache.ace.nodelauncher.api;version=latest,\
 	org.apache.ace.nodelauncher.ui;version=latest,\
-	org.apache.ace.useradmin.ui;version=latest
+	org.apache.ace.obr.metadata;version=latest,\
+	org.apache.ace.obr.servlet;version=latest,\
+	org.apache.ace.obr.storage;version=latest,\
+	org.apache.ace.range.api;version=latest,\
+	org.apache.ace.repository.api;version=latest,\
+	org.apache.ace.repository.impl;version=latest,\
+	org.apache.ace.repository.servlet;version=latest,\
+	org.apache.ace.resourceprocessor.useradmin;version=latest,\
+	org.apache.ace.scheduler.impl;version=latest,\
+	org.apache.ace.tageditor;version=latest,\
+	org.apache.ace.target.mgmt.ui;version=latest,\
+	org.apache.ace.useradmin.ui;version=latest,\
+	org.apache.ace.verifier.impl;version=latest,\
+	org.apache.ace.verifier.ui;version=latest,\
+	org.apache.ace.webui.vaadin;version=latest
 -runrepos: Workspace,\
 	Local Repository,\
 	Release,\

Modified: ace/trunk/run-server/server.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1465922&r1=1465921&r2=1465922&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Tue Apr  9 08:12:33 2013
@@ -25,18 +25,18 @@
 	org.apache.ace.deployment.provider.repositorybased;version=latest,\
 	org.apache.ace.deployment.servlet;version=latest,\
 	org.apache.ace.deployment.streamgenerator;version=latest,\
-	org.apache.ace.deployment.verifier;version=latest,\
+	org.apache.ace.verifier.impl;version=latest,\
 	org.apache.ace.httplistener;version=latest,\
-	org.apache.ace.log.servlet;version=latest,\
-	org.apache.ace.log;version=latest,\
+	org.apache.ace.log.server.servlet;version=latest,\
+	org.apache.ace.log.api;version=latest,\
 	org.apache.ace.range.api;version=latest,\
 	org.apache.ace.repository.api;version=latest,\
 	org.apache.ace.repository.impl;version=latest,\
 	org.apache.ace.repository.servlet;version=latest,\
 	org.apache.ace.resourceprocessor.useradmin;version=latest,\
-	org.apache.ace.scheduler;version=latest,\
-	org.apache.ace.server.log.store.api;version=latest,\
-	org.apache.ace.server.log.store.filelogstore;version=latest
+	org.apache.ace.scheduler.impl;version=latest,\
+	org.apache.ace.log.server.store.api;version=latest,\
+	org.apache.ace.log.server.store.file;version=latest
 -runrepos: Workspace,\
 	Release
 -runproperties: org.apache.felix.log.storeDebug=true,\



Mime
View raw message