You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2014/05/19 15:10:44 UTC
[1/5] git commit: added configuration for run to behave consistently
on netbeans 8
Repository: clerezza
Updated Branches:
refs/heads/master 7b13f59bd -> 5dad3a9bc
added configuration for run to behave consistently on netbeans 8
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/572c11ba
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/572c11ba
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/572c11ba
Branch: refs/heads/master
Commit: 572c11ba8b8b9c1669d480cebf07cf7dd76c11e4
Parents: b6a5e0f
Author: reto <re...@apache.org>
Authored: Sat May 17 19:42:40 2014 +0200
Committer: reto <re...@apache.org>
Committed: Sat May 17 19:42:40 2014 +0200
----------------------------------------------------------------------
.../launchers/full-launcher/nb-configuration.xml | 18 ++++++++++++++++++
.../linked-data-launcher/nb-configuration.xml | 18 ++++++++++++++++++
.../launchers/shell-launcher/nb-configuration.xml | 18 ++++++++++++++++++
.../typerendering-launcher/nb-configuration.xml | 18 ++++++++++++++++++
4 files changed, 72 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/572c11ba/provisioning/launchers/full-launcher/nb-configuration.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/full-launcher/nb-configuration.xml b/provisioning/launchers/full-launcher/nb-configuration.xml
new file mode 100644
index 0000000..ec4540c
--- /dev/null
+++ b/provisioning/launchers/full-launcher/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <netbeans.compile.on.save>none</netbeans.compile.on.save>
+ </properties>
+</project-shared-configuration>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/572c11ba/provisioning/launchers/linked-data-launcher/nb-configuration.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/linked-data-launcher/nb-configuration.xml b/provisioning/launchers/linked-data-launcher/nb-configuration.xml
new file mode 100644
index 0000000..ec4540c
--- /dev/null
+++ b/provisioning/launchers/linked-data-launcher/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <netbeans.compile.on.save>none</netbeans.compile.on.save>
+ </properties>
+</project-shared-configuration>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/572c11ba/provisioning/launchers/shell-launcher/nb-configuration.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/shell-launcher/nb-configuration.xml b/provisioning/launchers/shell-launcher/nb-configuration.xml
new file mode 100644
index 0000000..ec4540c
--- /dev/null
+++ b/provisioning/launchers/shell-launcher/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <netbeans.compile.on.save>none</netbeans.compile.on.save>
+ </properties>
+</project-shared-configuration>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/572c11ba/provisioning/launchers/typerendering-launcher/nb-configuration.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/typerendering-launcher/nb-configuration.xml b/provisioning/launchers/typerendering-launcher/nb-configuration.xml
new file mode 100644
index 0000000..ec4540c
--- /dev/null
+++ b/provisioning/launchers/typerendering-launcher/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <netbeans.compile.on.save>none</netbeans.compile.on.save>
+ </properties>
+</project-shared-configuration>
[3/5] git commit: CLEREZZA-918: key stored in user dir and update ssh
version to the latest version not cause AccessControlException
Posted by re...@apache.org.
CLEREZZA-918: key stored in user dir and update ssh version to the latest version not cause AccessControlException
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/89e83af0
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/89e83af0
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/89e83af0
Branch: refs/heads/master
Commit: 89e83af0c8bc5ad4512c64f9d4dd4d1092491f02
Parents: 1fa81e8
Author: Reto Bachmann-Gmür <re...@apache.org>
Authored: Mon May 19 15:05:54 2014 +0200
Committer: Reto Bachmann-Gmür <re...@apache.org>
Committed: Mon May 19 15:05:54 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 7 +-
platform.launcher.tdb/nbactions.xml | 5 +-
provisioning/security/pom.xml | 80 ++++++++++++++++++++
sshshell/pom.xml | 2 -
.../org/apache/clerezza/sshshell/SshShell.java | 11 ++-
5 files changed, 97 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/89e83af0/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5a2a7f1..9859a60 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -525,19 +525,18 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>2.0.3</version>
+ <version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.5.0</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-pam</artifactId>
- <version>0.5.0</version>
+ <version>0.8.0</version>
</dependency>
-
<dependency>
<groupId>org.jsslutils</groupId>
<artifactId>jsslutils</artifactId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/89e83af0/platform.launcher.tdb/nbactions.xml
----------------------------------------------------------------------
diff --git a/platform.launcher.tdb/nbactions.xml b/platform.launcher.tdb/nbactions.xml
index 5a222ce..3fc4ab5 100644
--- a/platform.launcher.tdb/nbactions.xml
+++ b/platform.launcher.tdb/nbactions.xml
@@ -8,6 +8,9 @@
<goal>antrun:run</goal>
<goal>-o</goal>
</goals>
+ <properties>
+ <vm.args>-Dclerezza.shell.disable=true</vm.args>
+ </properties>
</action>
<action>
<actionName>debug</actionName>
@@ -18,7 +21,7 @@
<goal>-o</goal>
</goals>
<properties>
- <vm.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</vm.args>
+ <vm.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -Dclerezza.shell.disable=true</vm.args>
<jpda.listen>true</jpda.listen>
</properties>
</action>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/89e83af0/provisioning/security/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/security/pom.xml b/provisioning/security/pom.xml
new file mode 100644
index 0000000..9ab4eda
--- /dev/null
+++ b/provisioning/security/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>clerezza</artifactId>
+ <groupId>org.apache.clerezza</groupId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.clerezza.provisioning</groupId>
+ <artifactId>security</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name>Clerezza - Provisioning - Security</name>
+ <description>Clerezza - Provisioning: What's needed for authentication and user manager.
+ </description>
+
+ <dependencies>
+
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.security.core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.usermanager</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.usermanager.webinterface</artifactId>
+ <version>0.14-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>permissiondescriptions</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.wymiwyg.karaf.tooling</groupId>
+ <artifactId>karaf-sling-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/89e83af0/sshshell/pom.xml
----------------------------------------------------------------------
diff --git a/sshshell/pom.xml b/sshshell/pom.xml
index 5a9ac95..d683933 100644
--- a/sshshell/pom.xml
+++ b/sshshell/pom.xml
@@ -40,12 +40,10 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-pam</artifactId>
- <version>0.5.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/89e83af0/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java
----------------------------------------------------------------------
diff --git a/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java b/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java
index f9acbc3..a06d3ad 100644
--- a/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java
+++ b/sshshell/src/main/java/org/apache/clerezza/sshshell/SshShell.java
@@ -20,6 +20,7 @@ package org.apache.clerezza.sshshell;
*
*/
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -64,7 +65,15 @@ public class SshShell {
public SshShell() {
sshd = SshServer.setUpDefaultServer();
- sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider("hostkey.ser"));
+ File clerezzaUserConfigDir = new File(new File(System.getProperty("user.home")), ".clerezza");
+ if (!clerezzaUserConfigDir.exists()) {
+ clerezzaUserConfigDir.mkdir();
+ }
+ File hostKeyDir = new File(clerezzaUserConfigDir, "ssh");
+ if (!hostKeyDir.exists()) {
+ hostKeyDir.mkdir();
+ }
+ sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File(hostKeyDir,"hostkey.ser").getAbsolutePath()));
sshd.setPasswordAuthenticator(new MyPasswordAuthenticator());
}
[2/5] git commit: added file to make sure run wors in netbeans 8
Posted by re...@apache.org.
added file to make sure run wors in netbeans 8
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/1fa81e80
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/1fa81e80
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/1fa81e80
Branch: refs/heads/master
Commit: 1fa81e8020aa50f067c6f3ad40fd88eb2d246cf3
Parents: 572c11b
Author: Reto Bachmann-Gmür <re...@apache.org>
Authored: Mon May 19 15:01:49 2014 +0200
Committer: Reto Bachmann-Gmür <re...@apache.org>
Committed: Mon May 19 15:01:49 2014 +0200
----------------------------------------------------------------------
platform.launcher.tdb/nb-configuration.xml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/1fa81e80/platform.launcher.tdb/nb-configuration.xml
----------------------------------------------------------------------
diff --git a/platform.launcher.tdb/nb-configuration.xml b/platform.launcher.tdb/nb-configuration.xml
new file mode 100644
index 0000000..ec4540c
--- /dev/null
+++ b/platform.launcher.tdb/nb-configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+ <netbeans.compile.on.save>none</netbeans.compile.on.save>
+ </properties>
+</project-shared-configuration>
[4/5] git commit: CLEREZZA-815: started security feature
Posted by re...@apache.org.
CLEREZZA-815: started security feature
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/812b70f7
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/812b70f7
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/812b70f7
Branch: refs/heads/master
Commit: 812b70f798bcef72cf072a9605698d2eca673544
Parents: 89e83af
Author: Reto Bachmann-Gmür <re...@apache.org>
Authored: Mon May 19 15:09:03 2014 +0200
Committer: Reto Bachmann-Gmür <re...@apache.org>
Committed: Mon May 19 15:09:03 2014 +0200
----------------------------------------------------------------------
.../security/src/main/feature/feature.xml | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/812b70f7/provisioning/security/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/provisioning/security/src/main/feature/feature.xml b/provisioning/security/src/main/feature/feature.xml
new file mode 100644
index 0000000..9b0f399
--- /dev/null
+++ b/provisioning/security/src/main/feature/feature.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+
+ <feature name='${project.artifactId}' description='${project.name}' version='${project.version}'>
+ <details>${project.description}</details>
+ <!-- <config>foo=bar</config> -->
+ </feature>
+
+</features>
\ No newline at end of file
[5/5] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/clerezza
Posted by re...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/5dad3a9b
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/5dad3a9b
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/5dad3a9b
Branch: refs/heads/master
Commit: 5dad3a9bc89da5b938337d71e14ad6d9c15f7c68
Parents: 812b70f 7b13f59
Author: Reto Bachmann-Gmür <re...@apache.org>
Authored: Mon May 19 15:09:09 2014 +0200
Committer: Reto Bachmann-Gmür <re...@apache.org>
Committed: Mon May 19 15:09:09 2014 +0200
----------------------------------------------------------------------
provisioning/launchers/full-launcher/pom.xml | 8 +
provisioning/pom.xml | 3 +-
provisioning/rdf.virtuoso/pom.xml | 221 +++++++++++++++++++
.../rdf.virtuoso/src/main/feature/feature.xml | 26 +++
4 files changed, 257 insertions(+), 1 deletion(-)
----------------------------------------------------------------------