Просмотр исходного кода

Update to Apache MINA/SSHD 0.11.0

tags/v1.5.1
James Moger 10 лет назад
Родитель
Сommit
646133f591
5 измененных файлов: 24 добавлений и 12 удалений
  1. 3
    3
      .classpath
  2. 2
    2
      build.moxie
  3. 9
    5
      gitblit.iml
  4. 5
    2
      releases.moxie
  5. 5
    0
      src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java

+ 3
- 3
.classpath Просмотреть файл

<classpathentry kind="lib" path="ext/javawriter-2.1.1.jar" sourcepath="ext/src/javawriter-2.1.1.jar" /> <classpathentry kind="lib" path="ext/javawriter-2.1.1.jar" sourcepath="ext/src/javawriter-2.1.1.jar" />
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" /> <classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" /> <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
<classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" />
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" />
<classpathentry kind="lib" path="ext/slf4j-api-1.7.5.jar" sourcepath="ext/src/slf4j-api-1.7.5.jar" />
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.5.jar" sourcepath="ext/src/slf4j-log4j12-1.7.5.jar" />
<classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" /> <classpathentry kind="lib" path="ext/mail-1.4.3.jar" sourcepath="ext/src/mail-1.4.3.jar" />
<classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" /> <classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
<classpathentry kind="lib" path="ext/jetty-all-9.1.4.v20140401.jar" sourcepath="ext/src/jetty-all-9.1.4.v20140401.jar" /> <classpathentry kind="lib" path="ext/jetty-all-9.1.4.v20140401.jar" sourcepath="ext/src/jetty-all-9.1.4.v20140401.jar" />
<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.49.jar" sourcepath="ext/src/bcprov-jdk15on-1.49.jar" /> <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.49.jar" sourcepath="ext/src/bcprov-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.49.jar" sourcepath="ext/src/bcmail-jdk15on-1.49.jar" /> <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.49.jar" sourcepath="ext/src/bcmail-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.49.jar" sourcepath="ext/src/bcpkix-jdk15on-1.49.jar" /> <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.49.jar" sourcepath="ext/src/bcpkix-jdk15on-1.49.jar" />
<classpathentry kind="lib" path="ext/sshd-core-0.10.1.jar" sourcepath="ext/src/sshd-core-0.10.1.jar" />
<classpathentry kind="lib" path="ext/sshd-core-0.11.0.jar" sourcepath="ext/src/sshd-core-0.11.0.jar" />
<classpathentry kind="lib" path="ext/mina-core-2.0.7.jar" sourcepath="ext/src/mina-core-2.0.7.jar" /> <classpathentry kind="lib" path="ext/mina-core-2.0.7.jar" sourcepath="ext/src/mina-core-2.0.7.jar" />
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" /> <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" /> <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />

+ 2
- 2
build.moxie Просмотреть файл

description: pure Java Git solution description: pure Java Git solution
groupId: com.gitblit groupId: com.gitblit
artifactId: gitblit artifactId: gitblit
version: 1.5.1-SNAPSHOT
version: 1.6.0-SNAPSHOT
inceptionYear: 2011 inceptionYear: 2011


# Current stable release # Current stable release
bouncycastle.version : 1.49 bouncycastle.version : 1.49
selenium.version : 2.28.0 selenium.version : 2.28.0
wikitext.version : 1.4 wikitext.version : 1.4
sshd.version: 0.10.1
sshd.version: 0.11.0
mina.version: 2.0.7 mina.version: 2.0.7
} }



+ 9
- 5
gitblit.iml Просмотреть файл

<root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.5.jar!/" /> <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.5.jar!/" />
</SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.5.jar!/" /> <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.5.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.5.jar!/" />
</SOURCES>
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library name="sshd-core-0.10.1.jar">
<library name="sshd-core-0.11.0.jar">
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/ext/sshd-core-0.10.1.jar!/" />
<root url="jar://$MODULE_DIR$/ext/sshd-core-0.11.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.10.1.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.11.0.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</orderEntry> </orderEntry>

+ 5
- 2
releases.moxie Просмотреть файл

fixes: ~ fixes: ~
changes: ~ changes: ~
additions: ~ additions: ~
dependencyChanges: ~
contributors: ~
dependencyChanges:
- update to Apache MINA/SSHD 0.11.0 (issue-410)
contributors:
- James Moger
- Ralph Hoffman
} }


# #

+ 5
- 0
src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java Просмотреть файл

public SshFile getFile(String file) { public SshFile getFile(String file) {
return null; return null;
} }

@Override
public FileSystemView getNormalizedView() {
return null;
}
}; };
} }
} }

Загрузка…
Отмена
Сохранить