Skip to content

Commit

Permalink
[#4] Repackage IUs to SVNKit 1.10 specific names
Browse files Browse the repository at this point in the history
ru.arsysop.svn.connector -> ru.arsysop.svn.connector.svnkit1_10
and so on
  • Loading branch information
ruspl-afed authored and eparovyshnaya committed Feb 10, 2024
1 parent 14fcc67 commit b092c1e
Show file tree
Hide file tree
Showing 22 changed files with 36 additions and 38 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ru.arsysop.svn.connector</name>
<name>ru.arsysop.svn.connector.svnkit1_10</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Manifest-Version: 1.0
Automatic-Module-Name: ru.arsysop.svn.connector
Automatic-Module-Name: ru.arsysop.svn.connector.svnkit1_10
Bundle-ManifestVersion: 2
Bundle-SymbolicName: ru.arsysop.svn.connector;singleton:=true
Bundle-SymbolicName: ru.arsysop.svn.connector.svnkit1_10;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: org.apache.subversion.javahl.types;version="1.10.11",
org.tmatesoft.sqljet.core;version="1.1.15",
org.tmatesoft.svn.core.javahl17;version="1.10.11",
org.tmatesoft.svn.util;version="1.10.11"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.18.0",
org.eclipse.team.svn.core;bundle-version="5.0.0"
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Export-Package: sun.security.x509
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
# ArSysOp - initial API and implementation
###

Bundle-Name = ArSysOp SVN Connector
Bundle-Name = ArSysOp SVN Connector with SVNKit 1.10
Bundle-Vendor = ArSysOp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<plugin>

<extension point="org.eclipse.team.svn.core.svnconnector">
<svnconnector class="ru.arsysop.svn.internal.connector.ConnectorFactory"/>
<svnconnector class="ru.arsysop.svn.connector.internal.svnkit1_10.SvnKit1_10ConnectorFactory"/>
</extension>

</plugin>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* ArSysOp - initial API and implementation
*/

package ru.arsysop.svn.internal.connector;
package ru.arsysop.svn.connector.internal.svnkit1_10;

import java.io.OutputStream;
import java.util.List;
Expand Down Expand Up @@ -55,7 +55,7 @@
import org.eclipse.team.svn.core.connector.configuration.ISVNConfigurationEventHandler;

//TODO
final class Connector implements ISVNConnector {
final class SvnKit1_10Connector implements ISVNConnector {

@Override
public void addCallListener(ISVNCallListener listener) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* ArSysOp - initial API and implementation
*/

package ru.arsysop.svn.internal.connector;
package ru.arsysop.svn.connector.internal.svnkit1_10;

import org.eclipse.core.runtime.Platform;
import org.eclipse.team.svn.core.connector.ISVNConnector;
Expand All @@ -28,14 +28,14 @@
import org.tmatesoft.svn.core.javahl17.SVNClientImpl;
import org.tmatesoft.svn.util.Version;

public final class ConnectorFactory implements ISVNConnectorFactory {
public final class SvnKit1_10ConnectorFactory implements ISVNConnectorFactory {

public ISVNConnector createConnector() {
return new Connector();
return new SvnKit1_10Connector();
}

public ISVNManager createManager() {
return new SvnManager();
return new SvnKit1_10Manager();
}

public String getName() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* ArSysOp - initial API and implementation
*/

package ru.arsysop.svn.internal.connector;
package ru.arsysop.svn.connector.internal.svnkit1_10;

import java.io.InputStream;
import java.io.OutputStream;
Expand All @@ -37,7 +37,7 @@
import org.eclipse.team.svn.core.connector.SVNRevisionRange;

//TODO
final class SvnManager implements ISVNManager {
final class SvnKit1_10Manager implements ISVNManager {

@Override
public void create(String repositoryPath, RepositoryKind repositoryType, String configPath, long options,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ru.arsysop.svn.connectors.feature</name>
<name>ru.arsysop.svn.connectors.svnkit1_10.feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
###


feature.name = ArSysOp SVN Connectors
feature.name = ArSysOp SVN Connectors with SVNKit 1.10
feature.vendor = ArSysOp
feature.description = ArSysOp SVN Connectors
feature.description = ArSysOp SVN Connectors with SVNKit 1.10
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
# Contributors:
# ArSysOp - initial API and implementation
-->

<feature
id="ru.arsysop.svn.connectors.feature"
id="ru.arsysop.svn.connectors.svnkit1_10.feature"
label="%feature.name"
version="0.1.0.qualifier"
provider-name="%feature.vendor"
Expand All @@ -41,10 +40,7 @@
</license>

<plugin
id="ru.arsysop.svn.connector"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
id="ru.arsysop.svn.connector.svnkit1_10"
version="0.0.0"/>

</feature>
6 changes: 3 additions & 3 deletions releng/ru.arsysop.svn.aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
<module>../ru.arsysop.svn.repository</module>
<module>../ru.arsysop.svn.target</module>

<module>../../bundles/ru.arsysop.svn.connector</module>
<module>../../features/ru.arsysop.svn.connectors.feature</module>
<module>../../bundles/ru.arsysop.svn.connector.svnkit1_10</module>
<module>../../features/ru.arsysop.svn.connectors.svnkit1_10.feature</module>
<module>../../features/ru.arsysop.svn.license.feature</module>
<module>../../tests/ru.arsysop.svn.connector.tests</module>
<module>../../tests/ru.arsysop.svn.connector.svnkit1_10.tests</module>
</modules>

</project>
2 changes: 1 addition & 1 deletion releng/ru.arsysop.svn.repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# ArSysOp - initial API and implementation
-->
<site>
<feature id="ru.arsysop.svn.connectors.feature">
<feature id="ru.arsysop.svn.connectors.svnkit1_10.feature">
<category name="ru.arsysop.svn.connectors.category"/>
</feature>
<bundle id="antlr.antlr"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ru.arsysop.svn.connector.tests</name>
<name>ru.arsysop.svn.connector.svnkit1_10.tests</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Automatic-Module-Name: ru.arsysop.svn.connector.tests
Automatic-Module-Name: ru.arsysop.svn.connector.svnkit1_10.tests
Bundle-ManifestVersion: 2
Bundle-SymbolicName: ru.arsysop.svn.connector.tests;singleton:=true
Bundle-SymbolicName: ru.arsysop.svn.connector.svnkit1_10.tests;singleton:=true
Bundle-Version: 0.1.0.qualifier
Bundle-ClassPath: .
Bundle-Name: %Bundle-Name
Expand All @@ -12,4 +12,4 @@ Import-Package: org.junit;version="4.12.0",
org.junit.jupiter.api;version="5.10.0",
org.junit.jupiter.api.function;version="5.10.0",
org.junit.jupiter.engine;version="5.10.0"
Fragment-Host: ru.arsysop.svn.connector
Fragment-Host: ru.arsysop.svn.connector.svnkit1_10
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,27 @@
* ArSysOp - initial API and implementation
*/

package ru.arsysop.svn.internal.connector;
package ru.arsysop.svn.internal.connector.svnkit1_10;

import static org.junit.Assert.assertNotNull;

import org.junit.jupiter.api.Test;

import ru.arsysop.svn.connector.internal.svnkit1_10.SvnKit1_10ConnectorFactory;

/**
* Require platform running
*/
public final class ConnectorFactoryTest {
public final class SvnKit1_10ConnectorFactoryTest {

@Test
void version() {
assertNotNull(new ConnectorFactory().getVersion());
assertNotNull(new SvnKit1_10ConnectorFactory().getVersion());
}

@Test
void clientVersion() {
assertNotNull(new ConnectorFactory().getClientVersion());
assertNotNull(new SvnKit1_10ConnectorFactory().getClientVersion());
}

}

0 comments on commit b092c1e

Please sign in to comment.