We have a separate JIRA project for SSHD:
https://issues.apache.org/jira/browse/SSHD
We should either roll it back into DIRMINA or use it, but I think
using both is quite confusing ...
On Mon, Apr 20, 2009 at 02:51, <[email protected]> wrote:
> Author: proyal
> Date: Mon Apr 20 00:51:17 2009
> New Revision: 766554
>
> URL: http://svn.apache.org/viewvc?rev=766554&view=rev
> Log:
> apply DIRMINA-688, split into two modules.
>
> Added:
> mina/sshd/trunk/sshd-core/ (with props)
> mina/sshd/trunk/sshd-core/pom.xml (with props)
> mina/sshd/trunk/sshd-core/src/
> - copied from r766551, mina/sshd/trunk/src/
> mina/sshd/trunk/sshd-pam/ (with props)
> mina/sshd/trunk/sshd-pam/pom.xml (with props)
> mina/sshd/trunk/sshd-pam/src/
> mina/sshd/trunk/sshd-pam/src/main/
> mina/sshd/trunk/sshd-pam/src/main/java/
> mina/sshd/trunk/sshd-pam/src/main/java/org/
> mina/sshd/trunk/sshd-pam/src/main/java/org/apache/
> mina/sshd/trunk/sshd-pam/src/main/java/org/apache/sshd/
> mina/sshd/trunk/sshd-pam/src/main/java/org/apache/sshd/server/
> mina/sshd/trunk/sshd-pam/src/main/java/org/apache/sshd/server/pam/
>
> mina/sshd/trunk/sshd-pam/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java
> - copied unchanged from r766551,
> mina/sshd/trunk/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java
> Removed:
> mina/sshd/trunk/src/
>
> mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/server/pam/PAMPasswordAuthenticator.java
> Modified:
> mina/sshd/trunk/pom.xml
>
> Modified: mina/sshd/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/mina/sshd/trunk/pom.xml?rev=766554&r1=766553&r2=766554&view=diff
> ==============================================================================
> --- mina/sshd/trunk/pom.xml (original)
> +++ mina/sshd/trunk/pom.xml Mon Apr 20 00:51:17 2009
> @@ -32,7 +32,7 @@
> <artifactId>sshd</artifactId>
> <version>1.0-SNAPSHOT</version>
> <name>Apache Mina SSHD</name>
> - <packaging>bundle</packaging>
> + <packaging>pom</packaging>
> <inceptionYear>2008</inceptionYear>
>
> <licenses>
> @@ -103,12 +103,6 @@
> <version>2.0.0-M4</version>
> </dependency>
> <dependency>
> - <groupId>net.sf.jpam</groupId>
> - <artifactId>jpam</artifactId>
> - <version>1.1</version>
> - <optional>true</optional>
> - </dependency>
> - <dependency>
> <groupId>com.jcraft</groupId>
> <artifactId>jzlib</artifactId>
> <version>1.0.7</version>
> @@ -129,7 +123,7 @@
> <dependency>
> <groupId>com.jcraft</groupId>
> <artifactId>jsch</artifactId>
> - <version>0.1.40</version>
> + <version>0.1.41</version>
> <scope>test</scope>
> </dependency>
> <dependency>
> @@ -139,6 +133,12 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging</artifactId>
> + <version>1.1.1</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> <groupId>junit</groupId>
> <artifactId>junit</artifactId>
> <version>4.4</version>
> @@ -153,50 +153,17 @@
> </dependencies>
>
> <build>
> - <resources>
> - <resource>
> - <directory>src/main/filtered-resources</directory>
> - <filtering>true</filtering>
> - </resource>
> - </resources>
> <plugins>
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-compiler-plugin</artifactId>
> + <version>2.0.2</version>
> <configuration>
> <source>1.5</source>
> <target>1.5</target>
> </configuration>
> </plugin>
> - <plugin>
> - <groupId>org.apache.felix</groupId>
> - <artifactId>maven-bundle-plugin</artifactId>
> - <version>1.4.3</version>
> - <extensions>true</extensions>
> - <configuration>
> - <instructions>
> -
> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
> - <Import-Package>
> - com.jcraft.jzlib*;resolution:=optional,
> - net.sf.jpam*;resolution:=optional,
> - org.bouncycastle*;resolution:=optional,
> - *
> - </Import-Package>
> - <Export-Package>
> - org.apache.sshd*;version=${version}
> - </Export-Package>
> - </instructions>
> - <unpackBundle>true</unpackBundle>
> - </configuration>
> - </plugin>
> - <plugin>
> - <groupId>org.apache.maven.plugins</groupId>
> - <artifactId>maven-surefire-plugin</artifactId>
> - <configuration>
> - <redirectTestOutputToFile>true</redirectTestOutputToFile>
> - </configuration>
> - </plugin>
> - </plugins>
> + </plugins>
> </build>
>
> <distributionManagement>
> @@ -207,4 +174,9 @@
> </repository>
> </distributionManagement>
>
> + <modules>
> + <module>sshd-core</module>
> + <module>sshd-pam</module>
> + </modules>
> +
> </project>
>
> Propchange: mina/sshd/trunk/sshd-core/
> ------------------------------------------------------------------------------
> --- svn:ignore (added)
> +++ svn:ignore Mon Apr 20 00:51:17 2009
> @@ -0,0 +1 @@
> +target
>
> Added: mina/sshd/trunk/sshd-core/pom.xml
> URL:
> http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/pom.xml?rev=766554&view=auto
> ==============================================================================
> --- mina/sshd/trunk/sshd-core/pom.xml (added)
> +++ mina/sshd/trunk/sshd-core/pom.xml Mon Apr 20 00:51:17 2009
> @@ -0,0 +1,141 @@
> +<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/maven-v4_0_0.xsd";
> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
> xmlns="http://maven.apache.org/POM/4.0.0";>
> +
> + <modelVersion>4.0.0</modelVersion>
> +
> + <parent>
> + <groupId>org.apache.sshd</groupId>
> + <artifactId>sshd</artifactId>
> + <version>1.0-SNAPSHOT</version>
> + </parent>
> +
> + <groupId>org.apache.sshd</groupId>
> + <artifactId>sshd-core</artifactId>
> + <version>1.0-SNAPSHOT</version>
> + <name>Apache Mina SSHD :: Core</name>
> + <packaging>bundle</packaging>
> + <inceptionYear>2008</inceptionYear>
> +
> + <dependencies>
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-core</artifactId>
> + <version>2.0.0-M4</version>
> + </dependency>
> + <dependency>
> + <groupId>com.jcraft</groupId>
> + <artifactId>jzlib</artifactId>
> + <version>1.0.7</version>
> + <optional>true</optional>
> + </dependency>
> + <dependency>
> + <groupId>bouncycastle</groupId>
> + <artifactId>bcprov-jdk15</artifactId>
> + <version>140</version>
> + <optional>true</optional>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-log4j12</artifactId>
> + <version>1.4.3</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>com.jcraft</groupId>
> + <artifactId>jsch</artifactId>
> + <version>0.1.41</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-context</artifactId>
> + <version>2.5.5</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging</artifactId>
> + <version>1.1.1</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>junit</groupId>
> + <artifactId>junit</artifactId>
> + <version>4.4</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>jline</groupId>
> + <artifactId>jline</artifactId>
> + <version>0.9.94</version>
> + <scope>test</scope>
> + </dependency>
> + </dependencies>
> +
> + <build>
> + <resources>
> + <resource>
> + <directory>src/main/filtered-resources</directory>
> + <filtering>true</filtering>
> + </resource>
> + </resources>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <version>1.4.3</version>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> +
> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
> + <Import-Package>
> + com.jcraft.jzlib*;resolution:=optional,
> + net.sf.jpam*;resolution:=optional,
> + org.bouncycastle*;resolution:=optional,
> + *
> + </Import-Package>
> + <Export-Package>
> + org.apache.sshd*;version=${version}
> + </Export-Package>
> + </instructions>
> + <unpackBundle>true</unpackBundle>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-surefire-plugin</artifactId>
> + <configuration>
> + <redirectTestOutputToFile>true</redirectTestOutputToFile>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> +
> + <distributionManagement>
> + <repository>
> + <id>dummy</id>
> + <name>Dummy to avoid accidental deploys</name>
> + <url/>
> + </repository>
> + </distributionManagement>
> +
> +</project>
>
> Propchange: mina/sshd/trunk/sshd-core/pom.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: mina/sshd/trunk/sshd-pam/
> ------------------------------------------------------------------------------
> --- svn:ignore (added)
> +++ svn:ignore Mon Apr 20 00:51:17 2009
> @@ -0,0 +1 @@
> +target
>
> Added: mina/sshd/trunk/sshd-pam/pom.xml
> URL:
> http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-pam/pom.xml?rev=766554&view=auto
> ==============================================================================
> --- mina/sshd/trunk/sshd-pam/pom.xml (added)
> +++ mina/sshd/trunk/sshd-pam/pom.xml Mon Apr 20 00:51:17 2009
> @@ -0,0 +1,84 @@
> +<?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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/maven-v4_0_0.xsd";
> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
> xmlns="http://maven.apache.org/POM/4.0.0";>
> +
> + <modelVersion>4.0.0</modelVersion>
> +
> + <parent>
> + <groupId>org.apache.sshd</groupId>
> + <artifactId>sshd</artifactId>
> + <version>1.0-SNAPSHOT</version>
> + </parent>
> +
> + <groupId>org.apache.sshd</groupId>
> + <artifactId>sshd-pam</artifactId>
> + <version>1.0-SNAPSHOT</version>
> + <name>Apache Mina SSHD :: PAM</name>
> + <!--
> + <packaging>bundle</packaging>
> + -->
> +
> + <dependencies>
> + <dependency>
> + <groupId>org.apache.mina</groupId>
> + <artifactId>mina-core</artifactId>
> + <version>2.0.0-M4</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.sshd</groupId>
> + <artifactId>sshd-core</artifactId>
> + <version>1.0-SNAPSHOT</version>
> + </dependency>
> + <dependency>
> + <groupId>net.sf.jpam</groupId>
> + <artifactId>jpam</artifactId>
> + <version>1.1</version>
> + </dependency>
> + </dependencies>
> +
> + <build>
> + <plugins>
> + <!--
> + <plugin>
> + <groupId>org.apache.felix</groupId>
> + <artifactId>maven-bundle-plugin</artifactId>
> + <version>1.4.3</version>
> + <extensions>true</extensions>
> + <configuration>
> + <instructions>
> +
> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
> + <Import-Package>
> + com.jcraft.jzlib*;resolution:=optional,
> + net.sf.jpam*;resolution:=optional,
> + org.bouncycastle*;resolution:=optional,
> + *
> + </Import-Package>
> + <Export-Package>
> + org.apache.sshd*;version=${version}
> + </Export-Package>
> + </instructions>
> + <unpackBundle>true</unpackBundle>
> + </configuration>
> + </plugin>
> + -->
> + </plugins>
> + </build>
> +</project>
>
> Propchange: mina/sshd/trunk/sshd-pam/pom.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
>
>
--
Cheers,
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
Open Source SOA
http://fusesource.com
