Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

531 replacing jsch with sshj in ssh app #551

Merged
merged 18 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<IsServiceGroupOnly>true</IsServiceGroupOnly>
</Meta>
<Libraries>SSHFileTransferImpl.jar</Libraries>
<SharedLibraries>sshlibs</SharedLibraries>
<Service Label="SSH File Transfer" TypeName="SSHFileTransfer">
<Operation IsStatic="true" Label="SCP To Remote Host" Name="sCPToRemoteHost">
<Meta>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Libraries>SSHNETCONFConnectionImpl.jar</Libraries>
<SharedLibraries>sshlibs</SharedLibraries>
<Service Label="SSH NETCONF connection" TypeName="SSHNETCONFConnection">
<Operation IsStatic="false" Label="Has Capability" Name="hasCapability">
<Input>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<Libraries>SSHShellConnectionImpl.jar</Libraries>
<SharedLibraries>sshlibs</SharedLibraries>
<Service Label="SSH shell connection" TypeName="SSHShellConnection">
<Meta>
<AdditionalDependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<Meta>
<IsServiceGroupOnly>false</IsServiceGroupOnly>
</Meta>
<SharedLibraries>sshlibs</SharedLibraries>
<Data Label="terminal height rows" VariableName="terminalHeightRows">
<Meta>
<Type>int</Type>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,10 @@

<import file="${root.dir}/installation/build/buildService.xml" />

<target name="prepareLibs" description="Build for application">
<ant antfile="build.xml" target="build" inheritAll="false" dir="${basedir}/../../sharedlib/SSHJSchUtils">
<property name="target.dir" value="${basedir}/lib/xyna" />
</ant>
</target>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
<ant antfile="build.xml" target="build" inheritAll="false" dir="${basedir}/../SSHConnectionImpl">
<property name="target.dir" value="${basedir}/lib/xyna" />
</ant>
<ant antfile="build.xml" target="build" inheritAll="false" dir="${basedir}/../../sharedlib/SSHJSchUtils">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the directory name "SSHJschUtils" should be renamed, because it doesn't contain anything regarding Jsch any more?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename SSHJSchUtils to SSHJUtils

<property name="target.dir" value="${basedir}/lib/xyna" />
</ant>
</target>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
<ant antfile="build.xml" target="build" inheritAll="false" dir="${basedir}/../SSHConnectionImpl">
<property name="target.dir" value="${basedir}/lib/xyna" />
</ant>
<ant antfile="build.xml" target="build" inheritAll="false" dir="${basedir}/../../sharedlib/SSHJSchUtils">
<property name="target.dir" value="${basedir}/lib/xyna" />
</ant>
</target>


Expand Down