From b9505fef5ba8186433e903e9de3c73c17bdf6562 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 13 Feb 2015 12:51:37 +0000 Subject: [PATCH] Move SLC Support git-svn-id: https://svn.argeo.org/slc/trunk@7843 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.slc.repo/bnd.bnd | 6 + org.argeo.slc.repo/pom.xml | 23 +- .../argeo/slc/repo/ArgeoOsgiDistribution.java | 0 .../argeo/slc/repo/ArtifactDistribution.java | 0 .../org/argeo/slc/repo/ArtifactIndexer.java | 0 .../src}/org/argeo/slc/repo/FreeLicense.java | 0 .../org/argeo/slc/repo/JarFileIndexer.java | 0 .../org/argeo/slc/repo/JavaRepoManager.java | 0 .../org/argeo/slc/repo/MavenProxyService.java | 0 .../slc/repo/ModularDistributionFactory.java | 0 .../slc/repo/ModularDistributionIndexer.java | 0 .../src}/org/argeo/slc/repo/NodeIndexer.java | 0 .../argeo/slc/repo/NodeIndexerVisitor.java | 0 .../argeo/slc/repo/OsgiBundlesProvider.java | 0 .../src}/org/argeo/slc/repo/OsgiFactory.java | 0 .../org/argeo/slc/repo/PdeSourcesIndexer.java | 0 .../org/argeo/slc/repo/RepoConstants.java | 0 .../src}/org/argeo/slc/repo/RepoService.java | 0 .../src}/org/argeo/slc/repo/RepoSync.java | 0 .../src}/org/argeo/slc/repo/RepoUtils.java | 0 .../src}/org/argeo/slc/repo/RpmIndexer.java | 0 .../org/argeo/slc/repo/RpmRepoManager.java | 0 .../org/argeo/slc/repo/SlcRepoManager.java | 0 .../slc/repo/core/AbstractJcrRepoManager.java | 0 .../slc/repo/core/JavaRepoManagerImpl.java | 0 .../argeo/slc/repo/core/RepoServiceImpl.java | 0 .../slc/repo/core/RpmRepoManagerImpl.java | 0 .../slc/repo/core/SlcRepoManagerImpl.java | 0 .../argeo/slc/repo/core/WorkspaceIndexer.java | 0 .../org/argeo/slc/repo/license/apache-2.0.txt | 0 .../argeo/slc/repo/license/bsd-3-clause.txt | 0 .../org/argeo/slc/repo/license/cddl-1.0.txt | 0 .../org/argeo/slc/repo/license/epl-1.0.txt | 0 .../org/argeo/slc/repo/license/gpl-2.0.txt | 0 .../org/argeo/slc/repo/license/gpl-3.0.txt | 0 .../org/argeo/slc/repo/license/lgpl-2.1.txt | 0 .../org/argeo/slc/repo/license/lgpl-3.0.txt | 0 .../src}/org/argeo/slc/repo/license/mit.txt | 0 .../slc/repo/maven/ConvertPoms_01_03.java | 0 .../slc/repo/maven/GenerateBinaries.java | 0 .../repo/maven/ImportMavenDependencies.java | 0 .../slc/repo/maven/IndexDistribution.java | 0 .../slc/repo/maven/MavenConventionsUtils.java | 0 .../slc/repo/maven/MavenProxyServiceImpl.java | 0 .../argeo/slc/repo/maven/Migration_01_03.java | 0 .../slc/repo/osgi/ArchiveSourcesProvider.java | 0 .../argeo/slc/repo/osgi/ArchiveWrapper.java | 0 .../repo/osgi/ArgeoOsgiDistributionImpl.java | 0 .../org/argeo/slc/repo/osgi/BndWrapper.java | 0 .../argeo/slc/repo/osgi/ImportBundlesZip.java | 0 .../argeo/slc/repo/osgi/JavaSE-1.6.profile | 194 +++++++++++++++++ .../argeo/slc/repo/osgi/JavaSE-1.7.profile | 198 ++++++++++++++++++ .../org/argeo/slc/repo/osgi/MavenWrapper.java | 0 .../argeo/slc/repo/osgi/NormalizeGroup.java | 0 .../org/argeo/slc/repo/osgi/ObrWrapper.java | 0 .../slc/repo/osgi/OsgiCategorizedNV.java | 0 .../argeo/slc/repo/osgi/OsgiFactoryImpl.java | 0 .../org/argeo/slc/repo/osgi/OsgiProfile.java | 0 .../slc/repo/osgi/ProcessDistribution.java | 0 .../argeo/slc/repo/osgi/SourcesProvider.java | 0 .../org/argeo/slc/repo/osgi/UriWrapper.java | 0 .../src/org/argeo/slc/repo/repo.cnd | 160 ++++++++++++++ org.argeo.slc.support/bnd.bnd | 6 + .../ext/test/log4j.properties | 22 ++ .../org/argeo/slc/diff/LineTokenizerTest.java | 0 org.argeo.slc.support/pom.xml | 8 + .../org/argeo/slc/diff/DataInterpreter.java | 0 .../src}/org/argeo/slc/diff/Diff.java | 0 .../src}/org/argeo/slc/diff/DiffIssue.java | 0 .../src}/org/argeo/slc/diff/DiffIssueKey.java | 0 .../src}/org/argeo/slc/diff/DiffKey.java | 0 .../src}/org/argeo/slc/diff/DiffMissing.java | 0 .../org/argeo/slc/diff/DiffMissingXml.java | 0 .../org/argeo/slc/diff/DiffNotMatched.java | 0 .../src}/org/argeo/slc/diff/DiffPosition.java | 0 .../src}/org/argeo/slc/diff/DiffResult.java | 0 .../org/argeo/slc/diff/KeyColumnsDiff.java | 0 .../org/argeo/slc/diff/LineTokenizer.java | 0 .../src}/org/argeo/slc/diff/RelatedFile.java | 0 .../org/argeo/slc/diff/TableDiffPosition.java | 0 .../src}/org/argeo/slc/diff/Tolerance.java | 0 .../org/argeo/slc/diff/ToleranceDiff.java | 0 .../org/argeo/slc/diff/XPathDiffPosition.java | 0 .../src}/org/argeo/slc/diff/package.html | 0 .../org/argeo/slc/jsch/AbstractJschTask.java | 0 .../slc/jsch/CallbackHandlerUserInfo.java | 0 .../argeo/slc/jsch/JschContextSession.java | 0 .../src}/org/argeo/slc/jsch/JschExecutor.java | 0 .../org/argeo/slc/jsch/JschMultiTasks.java | 0 .../src}/org/argeo/slc/jsch/RemoteExec.java | 0 .../src}/org/argeo/slc/jsch/ScpFrom.java | 0 .../src}/org/argeo/slc/jsch/ScpTo.java | 0 .../org/argeo/slc/jsch/SimpleUserInfo.java | 0 .../argeo/slc/jsch/SshFilesDeployment.java | 0 .../src}/org/argeo/slc/jsch/SshShell.java | 0 .../src}/org/argeo/slc/jsch/SshTarget.java | 0 .../org/argeo/slc/jsch/SwingUserInfo.java | 0 .../slc/lib/jcr/JcrRepositoryBackup.java | 10 +- .../linux/DefaultRedhatDeploymentData.java | 0 .../slc/lib/linux/DefaultRpmDistribution.java | 0 .../slc/lib/linux/DeployLxcContainer.java | 0 .../slc/lib/linux/RedhatDeploymentData.java | 0 .../slc/lib/linux/RedhatHostManager.java | 0 .../argeo/slc/lib/linux/RpmDistribution.java | 0 .../org/argeo/slc/lib/linux/ScriptCall.java | 0 .../argeo/slc/lib/linux/SimpleLinuxHost.java | 0 .../org/argeo/slc/lib/linux/lxc-init-guest.sh | 29 +++ .../org/argeo/slc/lib/linux/lxc-init-host.sh | 8 + .../src/org/argeo/slc/lib/linux/redhat.xml | 91 ++++++++ .../slc/lib/linux/rpmfactory/BuildInMock.java | 0 .../slc/lib/linux/rpmfactory/CreateSrpm.java | 0 .../slc/lib/linux/rpmfactory/ImportSrpm.java | 0 .../linux/rpmfactory/RpmBuildEnvironment.java | 0 .../slc/lib/linux/rpmfactory/RpmSpecFile.java | 0 .../org/argeo/slc/lib/svn/SvnKitDriver.java | 0 .../org/argeo/slc/lib/vbox/VBoxMachine.java | 0 .../org/argeo/slc/lib/vbox/VBoxManager.java | 0 .../src}/org/argeo/slc/lib/vbox/VBoxNat.java | 0 .../argeo/slc/lib/vbox/VBoxPortMapping.java | 0 .../argeo/slc/log4j/SlcExecutionAppender.java | 0 .../src}/org/argeo/slc/mail/SendMail.java | 0 .../deploy/HttpdApplicationDeployment.java | 0 .../deploy/HttpdApplicationTargetData.java | 0 .../argeo/slc/support/deploy/HttpdServer.java | 0 .../support/deploy/HttpdServerDeployment.java | 0 .../deploy/HttpdServerDeploymentData.java | 0 .../support/deploy/HttpdServerManager.java | 0 .../support/deploy/HttpdServerTargetData.java | 0 .../deploy/SimpleHttpdApplication.java | 0 .../slc/support/deploy/WebApplication.java | 0 .../argeo/slc/support/deploy/WebServer.java | 0 .../argeo/slc/support/deploy/db/DbModel.java | 0 .../slc/support/deploy/db/JdbcAware.java | 0 .../support/deploy/db/SimpleJdbcDatabase.java | 0 .../src}/org/argeo/slc/vfs/VfsResource.java | 9 +- .../org/argeo/slc/vfs/VfsResourceFactory.java | 6 +- .../org/argeo/slc/vfs/VfsResourceSet.java | 8 +- pom.xml | 31 +++ 138 files changed, 793 insertions(+), 16 deletions(-) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/ArgeoOsgiDistribution.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/ArtifactDistribution.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/ArtifactIndexer.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/FreeLicense.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/JarFileIndexer.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/JavaRepoManager.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/MavenProxyService.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/ModularDistributionFactory.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/ModularDistributionIndexer.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/NodeIndexer.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/NodeIndexerVisitor.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/OsgiBundlesProvider.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/OsgiFactory.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/PdeSourcesIndexer.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/RepoConstants.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/RepoService.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/RepoSync.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/RepoUtils.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/RpmIndexer.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/RpmRepoManager.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/SlcRepoManager.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/core/AbstractJcrRepoManager.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/core/JavaRepoManagerImpl.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/core/RepoServiceImpl.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/core/RpmRepoManagerImpl.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/core/SlcRepoManagerImpl.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/core/WorkspaceIndexer.java (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/apache-2.0.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/bsd-3-clause.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/cddl-1.0.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/epl-1.0.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/gpl-2.0.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/gpl-3.0.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/lgpl-2.1.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/lgpl-3.0.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/resources => org.argeo.slc.repo/src}/org/argeo/slc/repo/license/mit.txt (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/maven/ConvertPoms_01_03.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/maven/GenerateBinaries.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/maven/ImportMavenDependencies.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/maven/IndexDistribution.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/maven/MavenConventionsUtils.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/maven/Migration_01_03.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/ArchiveWrapper.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/BndWrapper.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/ImportBundlesZip.java (100%) create mode 100644 org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/JavaSE-1.6.profile create mode 100644 org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/JavaSE-1.7.profile rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/MavenWrapper.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/NormalizeGroup.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/ObrWrapper.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/OsgiCategorizedNV.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/OsgiProfile.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/ProcessDistribution.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/SourcesProvider.java (100%) rename {runtime/org.argeo.slc.repo/src/main/java => org.argeo.slc.repo/src}/org/argeo/slc/repo/osgi/UriWrapper.java (100%) create mode 100644 org.argeo.slc.repo/src/org/argeo/slc/repo/repo.cnd create mode 100644 org.argeo.slc.support/ext/test/log4j.properties rename {runtime/org.argeo.slc.support.simple/src/test/java => org.argeo.slc.support/ext/test}/org/argeo/slc/diff/LineTokenizerTest.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DataInterpreter.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/Diff.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DiffIssue.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DiffIssueKey.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DiffKey.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DiffMissing.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DiffMissingXml.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DiffNotMatched.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DiffPosition.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/DiffResult.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/KeyColumnsDiff.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/LineTokenizer.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/RelatedFile.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/TableDiffPosition.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/Tolerance.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/ToleranceDiff.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/XPathDiffPosition.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/diff/package.html (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/AbstractJschTask.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/CallbackHandlerUserInfo.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/JschContextSession.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/JschExecutor.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/JschMultiTasks.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/RemoteExec.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/ScpFrom.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/ScpTo.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/SimpleUserInfo.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/SshFilesDeployment.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/SshShell.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/SshTarget.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/jsch/SwingUserInfo.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java (96%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/DefaultRedhatDeploymentData.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/DefaultRpmDistribution.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/DeployLxcContainer.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/RedhatDeploymentData.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/RedhatHostManager.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/RpmDistribution.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/ScriptCall.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/SimpleLinuxHost.java (100%) create mode 100644 org.argeo.slc.support/src/org/argeo/slc/lib/linux/lxc-init-guest.sh create mode 100644 org.argeo.slc.support/src/org/argeo/slc/lib/linux/lxc-init-host.sh create mode 100644 org.argeo.slc.support/src/org/argeo/slc/lib/linux/redhat.xml rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/rpmfactory/ImportSrpm.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/linux/rpmfactory/RpmSpecFile.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/svn/SvnKitDriver.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/vbox/VBoxMachine.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/vbox/VBoxManager.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/vbox/VBoxNat.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/lib/vbox/VBoxPortMapping.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/log4j/SlcExecutionAppender.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/mail/SendMail.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/HttpdServer.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/HttpdServerDeployment.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/HttpdServerManager.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/HttpdServerTargetData.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/SimpleHttpdApplication.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/WebApplication.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/WebServer.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/db/DbModel.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/db/JdbcAware.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java (100%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/vfs/VfsResource.java (93%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/vfs/VfsResourceFactory.java (90%) rename {runtime/org.argeo.slc.support.simple/src/main/java => org.argeo.slc.support/src}/org/argeo/slc/vfs/VfsResourceSet.java (91%) diff --git a/org.argeo.slc.repo/bnd.bnd b/org.argeo.slc.repo/bnd.bnd index e69de29bb..8bc8df012 100644 --- a/org.argeo.slc.repo/bnd.bnd +++ b/org.argeo.slc.repo/bnd.bnd @@ -0,0 +1,6 @@ +Import-Package: org.w3c.dom.*,\ +org.xml.sax.*,\ +javax.xml.transform.*,\ +javax.xml.parsers.*,\ +javax.jcr.nodetype,\ +* diff --git a/org.argeo.slc.repo/pom.xml b/org.argeo.slc.repo/pom.xml index 737cd0b00..8ba17d7ed 100644 --- a/org.argeo.slc.repo/pom.xml +++ b/org.argeo.slc.repo/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -8,4 +9,24 @@ org.argeo.slc.repo SLC Repo + + + + org.argeo.slc + org.argeo.slc.support + 2.1.1-SNAPSHOT + + + org.argeo.slc + org.argeo.slc.core + 2.1.1-SNAPSHOT + + + + + org.argeo.commons + org.argeo.server.jcr + ${version.argeo-commons} + + \ No newline at end of file diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArgeoOsgiDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArgeoOsgiDistribution.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArgeoOsgiDistribution.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/ArgeoOsgiDistribution.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactDistribution.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactDistribution.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactDistribution.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ArtifactIndexer.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/FreeLicense.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/FreeLicense.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/FreeLicense.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/FreeLicense.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JarFileIndexer.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JavaRepoManager.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/JavaRepoManager.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/JavaRepoManager.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/JavaRepoManager.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/MavenProxyService.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/MavenProxyService.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/MavenProxyService.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/MavenProxyService.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ModularDistributionFactory.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ModularDistributionFactory.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ModularDistributionIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ModularDistributionIndexer.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/NodeIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/NodeIndexer.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/NodeIndexer.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/NodeIndexer.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/NodeIndexerVisitor.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/NodeIndexerVisitor.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/NodeIndexerVisitor.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/NodeIndexerVisitor.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/OsgiBundlesProvider.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/OsgiBundlesProvider.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/OsgiBundlesProvider.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/OsgiBundlesProvider.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/OsgiFactory.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/OsgiFactory.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/OsgiFactory.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/OsgiFactory.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/PdeSourcesIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/PdeSourcesIndexer.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoConstants.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoConstants.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/RepoConstants.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoService.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoService.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoService.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/RepoService.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoSync.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoSync.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RpmIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RpmIndexer.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RpmRepoManager.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmRepoManager.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RpmRepoManager.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/RpmRepoManager.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/SlcRepoManager.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/SlcRepoManager.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/SlcRepoManager.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/SlcRepoManager.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/AbstractJcrRepoManager.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/AbstractJcrRepoManager.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/AbstractJcrRepoManager.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/core/AbstractJcrRepoManager.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/JavaRepoManagerImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/JavaRepoManagerImpl.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/JavaRepoManagerImpl.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/core/JavaRepoManagerImpl.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/RepoServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/RepoServiceImpl.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/RpmRepoManagerImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RpmRepoManagerImpl.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/RpmRepoManagerImpl.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/core/RpmRepoManagerImpl.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/SlcRepoManagerImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/SlcRepoManagerImpl.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/SlcRepoManagerImpl.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/core/SlcRepoManagerImpl.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/WorkspaceIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/WorkspaceIndexer.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/core/WorkspaceIndexer.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/core/WorkspaceIndexer.java diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/apache-2.0.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/apache-2.0.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/apache-2.0.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/apache-2.0.txt diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/bsd-3-clause.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/bsd-3-clause.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/bsd-3-clause.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/bsd-3-clause.txt diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/cddl-1.0.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/cddl-1.0.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/cddl-1.0.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/cddl-1.0.txt diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/epl-1.0.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/epl-1.0.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/epl-1.0.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/epl-1.0.txt diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/gpl-2.0.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/gpl-2.0.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/gpl-2.0.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/gpl-2.0.txt diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/gpl-3.0.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/gpl-3.0.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/gpl-3.0.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/gpl-3.0.txt diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/lgpl-2.1.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/lgpl-2.1.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/lgpl-2.1.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/lgpl-2.1.txt diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/lgpl-3.0.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/lgpl-3.0.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/lgpl-3.0.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/lgpl-3.0.txt diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/mit.txt b/org.argeo.slc.repo/src/org/argeo/slc/repo/license/mit.txt similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/license/mit.txt rename to org.argeo.slc.repo/src/org/argeo/slc/repo/license/mit.txt diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ConvertPoms_01_03.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ConvertPoms_01_03.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ConvertPoms_01_03.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ConvertPoms_01_03.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/GenerateBinaries.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/GenerateBinaries.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/maven/ImportMavenDependencies.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/IndexDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/IndexDistribution.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/Migration_01_03.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/Migration_01_03.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArchiveWrapper.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/BndWrapper.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ImportBundlesZip.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ImportBundlesZip.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/JavaSE-1.6.profile b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/JavaSE-1.6.profile new file mode 100644 index 000000000..68e811f69 --- /dev/null +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/JavaSE-1.6.profile @@ -0,0 +1,194 @@ +############################################################################### +# Copyright (c) 2003, 2008 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +org.osgi.framework.system.packages = \ + javax.accessibility,\ + javax.activation,\ + javax.activity,\ + javax.annotation,\ + javax.annotation.processing,\ + javax.crypto,\ + javax.crypto.interfaces,\ + javax.crypto.spec,\ + javax.imageio,\ + javax.imageio.event,\ + javax.imageio.metadata,\ + javax.imageio.plugins.bmp,\ + javax.imageio.plugins.jpeg,\ + javax.imageio.spi,\ + javax.imageio.stream,\ + javax.jws,\ + javax.jws.soap,\ + javax.lang.model,\ + javax.lang.model.element,\ + javax.lang.model.type,\ + javax.lang.model.util,\ + javax.management,\ + javax.management.loading,\ + javax.management.modelmbean,\ + javax.management.monitor,\ + javax.management.openmbean,\ + javax.management.relation,\ + javax.management.remote,\ + javax.management.remote.rmi,\ + javax.management.timer,\ + javax.naming,\ + javax.naming.directory,\ + javax.naming.event,\ + javax.naming.ldap,\ + javax.naming.spi,\ + javax.net,\ + javax.net.ssl,\ + javax.print,\ + javax.print.attribute,\ + javax.print.attribute.standard,\ + javax.print.event,\ + javax.rmi,\ + javax.rmi.CORBA,\ + javax.rmi.ssl,\ + javax.script,\ + javax.security.auth,\ + javax.security.auth.callback,\ + javax.security.auth.kerberos,\ + javax.security.auth.login,\ + javax.security.auth.spi,\ + javax.security.auth.x500,\ + javax.security.cert,\ + javax.security.sasl,\ + javax.sound.midi,\ + javax.sound.midi.spi,\ + javax.sound.sampled,\ + javax.sound.sampled.spi,\ + javax.sql,\ + javax.sql.rowset,\ + javax.sql.rowset.serial,\ + javax.sql.rowset.spi,\ + javax.swing,\ + javax.swing.border,\ + javax.swing.colorchooser,\ + javax.swing.event,\ + javax.swing.filechooser,\ + javax.swing.plaf,\ + javax.swing.plaf.basic,\ + javax.swing.plaf.metal,\ + javax.swing.plaf.multi,\ + javax.swing.plaf.synth,\ + javax.swing.table,\ + javax.swing.text,\ + javax.swing.text.html,\ + javax.swing.text.html.parser,\ + javax.swing.text.rtf,\ + javax.swing.tree,\ + javax.swing.undo,\ + javax.tools,\ + javax.transaction,\ + javax.transaction.xa,\ + javax.xml,\ + javax.xml.bind,\ + javax.xml.bind.annotation,\ + javax.xml.bind.annotation.adapters,\ + javax.xml.bind.attachment,\ + javax.xml.bind.helpers,\ + javax.xml.bind.util,\ + javax.xml.crypto,\ + javax.xml.crypto.dom,\ + javax.xml.crypto.dsig,\ + javax.xml.crypto.dsig.dom,\ + javax.xml.crypto.dsig.keyinfo,\ + javax.xml.crypto.dsig.spec,\ + javax.xml.datatype,\ + javax.xml.namespace,\ + javax.xml.parsers,\ + javax.xml.soap,\ + javax.xml.stream,\ + javax.xml.stream.events,\ + javax.xml.stream.util,\ + javax.xml.transform,\ + javax.xml.transform.dom,\ + javax.xml.transform.sax,\ + javax.xml.transform.stax,\ + javax.xml.transform.stream,\ + javax.xml.validation,\ + javax.xml.ws,\ + javax.xml.ws.handler,\ + javax.xml.ws.handler.soap,\ + javax.xml.ws.http,\ + javax.xml.ws.soap,\ + javax.xml.ws.spi,\ + javax.xml.ws.wsaddressing,\ + javax.xml.xpath,\ + org.ietf.jgss,\ + org.omg.CORBA,\ + org.omg.CORBA_2_3,\ + org.omg.CORBA_2_3.portable,\ + org.omg.CORBA.DynAnyPackage,\ + org.omg.CORBA.ORBPackage,\ + org.omg.CORBA.portable,\ + org.omg.CORBA.TypeCodePackage,\ + org.omg.CosNaming,\ + org.omg.CosNaming.NamingContextExtPackage,\ + org.omg.CosNaming.NamingContextPackage,\ + org.omg.Dynamic,\ + org.omg.DynamicAny,\ + org.omg.DynamicAny.DynAnyFactoryPackage,\ + org.omg.DynamicAny.DynAnyPackage,\ + org.omg.IOP,\ + org.omg.IOP.CodecFactoryPackage,\ + org.omg.IOP.CodecPackage,\ + org.omg.Messaging,\ + org.omg.PortableInterceptor,\ + org.omg.PortableInterceptor.ORBInitInfoPackage,\ + org.omg.PortableServer,\ + org.omg.PortableServer.CurrentPackage,\ + org.omg.PortableServer.POAManagerPackage,\ + org.omg.PortableServer.POAPackage,\ + org.omg.PortableServer.portable,\ + org.omg.PortableServer.ServantLocatorPackage,\ + org.omg.SendingContext,\ + org.omg.stub.java.rmi,\ + org.w3c.dom,\ + org.w3c.dom.bootstrap,\ + org.w3c.dom.css,\ + org.w3c.dom.events,\ + org.w3c.dom.html,\ + org.w3c.dom.ls,\ + org.w3c.dom.ranges,\ + org.w3c.dom.stylesheets,\ + org.w3c.dom.traversal,\ + org.w3c.dom.views,\ + org.w3c.dom.xpath,\ + org.xml.sax,\ + org.xml.sax.ext,\ + org.xml.sax.helpers +org.osgi.framework.bootdelegation = \ + javax.*,\ + org.ietf.jgss,\ + org.omg.*,\ + org.w3c.*,\ + org.xml.*,\ + sun.*,\ + com.sun.* +org.osgi.framework.executionenvironment = \ + OSGi/Minimum-1.0,\ + OSGi/Minimum-1.1,\ + OSGi/Minimum-1.2,\ + JRE-1.1,\ + J2SE-1.2,\ + J2SE-1.3,\ + J2SE-1.4,\ + J2SE-1.5,\ + JavaSE-1.6 +osgi.java.profile.name = JavaSE-1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/JavaSE-1.7.profile b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/JavaSE-1.7.profile new file mode 100644 index 000000000..192b46e9f --- /dev/null +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/JavaSE-1.7.profile @@ -0,0 +1,198 @@ +############################################################################### +# Copyright (c) 2009, 2010 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +org.osgi.framework.system.packages = \ + javax.accessibility,\ + javax.activation,\ + javax.activity,\ + javax.annotation,\ + javax.annotation.processing,\ + javax.crypto,\ + javax.crypto.interfaces,\ + javax.crypto.spec,\ + javax.imageio,\ + javax.imageio.event,\ + javax.imageio.metadata,\ + javax.imageio.plugins.bmp,\ + javax.imageio.plugins.jpeg,\ + javax.imageio.spi,\ + javax.imageio.stream,\ + javax.jws,\ + javax.jws.soap,\ + javax.lang.model,\ + javax.lang.model.element,\ + javax.lang.model.type,\ + javax.lang.model.util,\ + javax.management,\ + javax.management.event,\ + javax.management.loading,\ + javax.management.modelmbean,\ + javax.management.monitor,\ + javax.management.namespace,\ + javax.management.openmbean,\ + javax.management.relation,\ + javax.management.remote,\ + javax.management.remote.rmi,\ + javax.management.timer,\ + javax.naming,\ + javax.naming.directory,\ + javax.naming.event,\ + javax.naming.ldap,\ + javax.naming.spi,\ + javax.net,\ + javax.net.ssl,\ + javax.print,\ + javax.print.attribute,\ + javax.print.attribute.standard,\ + javax.print.event,\ + javax.rmi,\ + javax.rmi.CORBA,\ + javax.rmi.ssl,\ + javax.script,\ + javax.security.auth,\ + javax.security.auth.callback,\ + javax.security.auth.kerberos,\ + javax.security.auth.login,\ + javax.security.auth.spi,\ + javax.security.auth.x500,\ + javax.security.cert,\ + javax.security.sasl,\ + javax.sound.midi,\ + javax.sound.midi.spi,\ + javax.sound.sampled,\ + javax.sound.sampled.spi,\ + javax.sql,\ + javax.sql.rowset,\ + javax.sql.rowset.serial,\ + javax.sql.rowset.spi,\ + javax.swing,\ + javax.swing.border,\ + javax.swing.colorchooser,\ + javax.swing.event,\ + javax.swing.filechooser,\ + javax.swing.plaf,\ + javax.swing.plaf.basic,\ + javax.swing.plaf.metal,\ + javax.swing.plaf.multi,\ + javax.swing.plaf.nimbus,\ + javax.swing.plaf.synth,\ + javax.swing.table,\ + javax.swing.text,\ + javax.swing.text.html,\ + javax.swing.text.html.parser,\ + javax.swing.text.rtf,\ + javax.swing.tree,\ + javax.swing.undo,\ + javax.tools,\ + javax.transaction,\ + javax.transaction.xa,\ + javax.xml,\ + javax.xml.bind,\ + javax.xml.bind.annotation,\ + javax.xml.bind.annotation.adapters,\ + javax.xml.bind.attachment,\ + javax.xml.bind.helpers,\ + javax.xml.bind.util,\ + javax.xml.crypto,\ + javax.xml.crypto.dom,\ + javax.xml.crypto.dsig,\ + javax.xml.crypto.dsig.dom,\ + javax.xml.crypto.dsig.keyinfo,\ + javax.xml.crypto.dsig.spec,\ + javax.xml.datatype,\ + javax.xml.namespace,\ + javax.xml.parsers,\ + javax.xml.soap,\ + javax.xml.stream,\ + javax.xml.stream.events,\ + javax.xml.stream.util,\ + javax.xml.transform,\ + javax.xml.transform.dom,\ + javax.xml.transform.sax,\ + javax.xml.transform.stax,\ + javax.xml.transform.stream,\ + javax.xml.validation,\ + javax.xml.ws,\ + javax.xml.ws.handler,\ + javax.xml.ws.handler.soap,\ + javax.xml.ws.http,\ + javax.xml.ws.soap,\ + javax.xml.ws.spi,\ + javax.xml.ws.wsaddressing,\ + javax.xml.xpath,\ + org.ietf.jgss,\ + org.omg.CORBA,\ + org.omg.CORBA_2_3,\ + org.omg.CORBA_2_3.portable,\ + org.omg.CORBA.DynAnyPackage,\ + org.omg.CORBA.ORBPackage,\ + org.omg.CORBA.portable,\ + org.omg.CORBA.TypeCodePackage,\ + org.omg.CosNaming,\ + org.omg.CosNaming.NamingContextExtPackage,\ + org.omg.CosNaming.NamingContextPackage,\ + org.omg.Dynamic,\ + org.omg.DynamicAny,\ + org.omg.DynamicAny.DynAnyFactoryPackage,\ + org.omg.DynamicAny.DynAnyPackage,\ + org.omg.IOP,\ + org.omg.IOP.CodecFactoryPackage,\ + org.omg.IOP.CodecPackage,\ + org.omg.Messaging,\ + org.omg.PortableInterceptor,\ + org.omg.PortableInterceptor.ORBInitInfoPackage,\ + org.omg.PortableServer,\ + org.omg.PortableServer.CurrentPackage,\ + org.omg.PortableServer.POAManagerPackage,\ + org.omg.PortableServer.POAPackage,\ + org.omg.PortableServer.portable,\ + org.omg.PortableServer.ServantLocatorPackage,\ + org.omg.SendingContext,\ + org.omg.stub.java.rmi,\ + org.w3c.dom,\ + org.w3c.dom.bootstrap,\ + org.w3c.dom.css,\ + org.w3c.dom.events,\ + org.w3c.dom.html,\ + org.w3c.dom.ls,\ + org.w3c.dom.ranges,\ + org.w3c.dom.stylesheets,\ + org.w3c.dom.traversal,\ + org.w3c.dom.views,\ + org.w3c.dom.xpath,\ + org.xml.sax,\ + org.xml.sax.ext,\ + org.xml.sax.helpers +org.osgi.framework.bootdelegation = \ + javax.*,\ + org.ietf.jgss,\ + org.omg.*,\ + org.w3c.*,\ + org.xml.*,\ + sun.*,\ + com.sun.* +org.osgi.framework.executionenvironment = \ + OSGi/Minimum-1.0,\ + OSGi/Minimum-1.1,\ + OSGi/Minimum-1.2,\ + JRE-1.1,\ + J2SE-1.2,\ + J2SE-1.3,\ + J2SE-1.4,\ + J2SE-1.5,\ + JavaSE-1.6,\ + JavaSE-1.7 +osgi.java.profile.name = JavaSE-1.7 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/MavenWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/MavenWrapper.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ObrWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ObrWrapper.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ObrWrapper.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ObrWrapper.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiCategorizedNV.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiCategorizedNV.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiCategorizedNV.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiCategorizedNV.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiProfile.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiProfile.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/OsgiProfile.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiProfile.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ProcessDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ProcessDistribution.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/SourcesProvider.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SourcesProvider.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/SourcesProvider.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SourcesProvider.java diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/UriWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java similarity index 100% rename from runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/UriWrapper.java rename to org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/repo.cnd b/org.argeo.slc.repo/src/org/argeo/slc/repo/repo.cnd new file mode 100644 index 000000000..271e85eee --- /dev/null +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/repo.cnd @@ -0,0 +1,160 @@ + + +// AETHER +[slc:artifact] > mix:referenceable, mix:created, mix:lastModified +mixin +- slc:artifactId (STRING) m +- slc:groupId (STRING) m +- slc:artifactVersion (STRING) m +- slc:artifactExtension (STRING) m +- slc:artifactClassifier (STRING) ='' m a + +[slc:artifactVersion] > mix:referenceable, mix:created, mix:lastModified, mix:title +mixin +- slc:artifactId (STRING) m +- slc:groupId (STRING) m +- slc:artifactVersion (STRING) m + +[slc:artifactBase] > mix:referenceable, mix:created, mix:lastModified +mixin +- slc:artifactId (STRING) m +- slc:groupId (STRING) m + +[slc:groupBase] > mix:referenceable, mix:created, mix:lastModified +mixin +// it is possible to have groupBase being artifact base (e.g. org.argeo.commons.basic) +// so using groupId would conflict +- slc:groupBaseId (STRING) m + +// Mark a given group base as relevant to create modular distribution in the current workspace +// [slc:category] +// mixin + +[slc:distribution] > slc:artifactVersion +mixin ++ slc:artifactVersions (argeo:references) m + + +[slc:modularDistributionBase] +mixin + +// Question: Extend slc:categorizedNameVersion ? (not possible without migration) +[slc:modularDistribution] +mixin ++ slc:modules (nt:unstructured) m + +[slc:moduleCoordinates] > nt:unstructured +- slc:category (STRING) +- slc:name (STRING) +- slc:version (STRING) + + +// ORIGINS +[slc:knownOrigin] > nt:base +mixin ++ slc:origin (nt:address) + +[slc:proxied] > nt:address +- slc:proxy (REFERENCE) + +// JAVA +[slc:jarFile] > mix:referenceable +mixin +- 'slc:manifest' (BINARY) m +- 'slc:Manifest-Version' (STRING) +- 'slc:Signature-Version' (STRING) +- 'slc:Class-Path' (STRING) +- 'slc:Main-Class' (STRING) +- 'slc:Extension-Name' (STRING) +- 'slc:Implementation-Version' (STRING) +- 'slc:Implementation-Vendor' (STRING) +- 'slc:Implementation-Vendor-Id' (STRING) +- 'slc:Implementation-URL' (STRING) +- 'slc:Specification-Title' (STRING) +- 'slc:Specification-Version' (STRING) +- 'slc:Specification-Vendor' (STRING) +- 'slc:Sealed' (STRING) + +// OSGi +// see http://www.osgi.org/Specifications/Reference + +[slc:javaPackage] > mix:referenceable +- slc:name (STRING) primary m + +[slc:osgiBaseVersion] > mix:referenceable +- slc:asString (STRING) primary m +- slc:major (LONG) m +- slc:minor (LONG) m +- slc:micro (LONG) m + +[slc:osgiVersion] > slc:osgiBaseVersion +- slc:qualifier (STRING) + +[slc:exportedPackage] > slc:javaPackage ++ slc:uses (slc:javaPackage) multiple ++ slc:version (slc:osgiVersion) + +[slc:importedPackage] > slc:javaPackage +- slc:version (STRING) ='0.0.0' m a +- slc:optional (BOOLEAN) ='false' m a + +[slc:dynamicImportedPackage] > slc:javaPackage +- slc:version (STRING) ='0.0.0' m a +- slc:optional (BOOLEAN) ='false' m a + +[slc:requiredBundle] > mix:referenceable +- 'slc:symbolic-name' (STRING) primary m +- 'slc:bundle-version' (STRING) ='0.0.0' m a +- slc:optional (BOOLEAN) ='false' m a + +[slc:fragmentHost] > mix:referenceable +- 'slc:symbolic-name' (STRING) m +- 'slc:bundle-version' (STRING) ='0.0.0' m a + +[slc:bundleNativeCode] > mix:referenceable +- slc:path (STRING) primary m +- slc:osname (STRING) +- slc:processor (STRING) + +// see http://www.osgi.org/Specifications/ReferenceHeaders +[slc:bundle] > mix:referenceable +mixin +- 'slc:symbolic-name' (STRING) primary m +- 'slc:bundle-version' (STRING) m +- 'slc:Bundle-SymbolicName' (STRING) m +- 'slc:Bundle-Name' (STRING) +- 'slc:Bundle-Description' (STRING) +- 'slc:Bundle-ManifestVersion' (STRING) +- 'slc:Bundle-Category' (STRING) +- 'slc:Bundle-ActivationPolicy' (STRING) +- 'slc:Bundle-Copyright' (STRING) +- 'slc:Bundle-Vendor' (STRING) +- 'slc:Bundle-License' (STRING) +- 'slc:Bundle-DocURL' (STRING) +- 'slc:Bundle-ContactAddress' (STRING) +- 'slc:Bundle-Activator' (STRING) +- 'slc:Bundle-UpdateLocation' (STRING) +- 'slc:Bundle-Localization' (STRING) +- 'slc:Bundle-ClassPath' (STRING) * +// see http://wiki.eclipse.org/EE < 'OSGi/Minimum-1.0','OSGi/Minimum-1.1','CDC-1.0/Foundation-1.0','CDC-1.1/Foundation-1.1','JRE-1.1','J2SE-1.2','J2SE-1.3','J2SE-1.4','J2SE-1.5','JavaSE-1.6','JavaSE-1.7' +- 'slc:Bundle-RequiredExecutionEnvironment' (STRING) * ++ 'slc:Bundle-Version' (slc:osgiVersion) m ++ 'slc:Fragment-Host' (slc:fragmentHost) ++ 'slc:Import-Package' (slc:importedPackage) multiple ++ 'slc:Export-Package' (slc:exportedPackage) multiple ++ 'slc:Require-Bundle' (slc:requiredBundle) multiple ++ 'slc:Bundle-NativeCode' (slc:bundleNativeCode) multiple ++ 'slc:DynamicImport-Package' (slc:dynamicImportedPackage) multiple + +[slc:bundleArtifact] > slc:artifact,slc:jarFile,slc:bundle +mixin + +// RPM +[slc:rpm] > mix:referenceable, mix:created, mix:lastModified, mix:title +mixin +- slc:name (STRING) +- slc:version (STRING) +- slc:rpmVersion (STRING) +- slc:rpmRelease (STRING) +- slc:rpmArch (STRING) +- slc:rpmArchivaeSize (STRING) diff --git a/org.argeo.slc.support/bnd.bnd b/org.argeo.slc.support/bnd.bnd index e69de29bb..acf329fc8 100644 --- a/org.argeo.slc.support/bnd.bnd +++ b/org.argeo.slc.support/bnd.bnd @@ -0,0 +1,6 @@ +Import-Package: org.apache.commons.logging,\ +org.dbunit.*;resolution:="optional",\ +junit.framework;resolution:="optional",\ +org.apache.commons.vfs.*,\ +javax.swing.plaf.metal,\ +* \ No newline at end of file diff --git a/org.argeo.slc.support/ext/test/log4j.properties b/org.argeo.slc.support/ext/test/log4j.properties new file mode 100644 index 000000000..0133bab88 --- /dev/null +++ b/org.argeo.slc.support/ext/test/log4j.properties @@ -0,0 +1,22 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=WARN, console + +## Levels +# Slc +log4j.logger.org.argeo=DEBUG + +# Castor +log4j.logger.org.exolab.castor=WARN + +# Spring +log4j.logger.org.springframework=WARN + + +## Appenders +# A1 is set to be a ConsoleAppender. +log4j.appender.console=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n + diff --git a/runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/diff/LineTokenizerTest.java b/org.argeo.slc.support/ext/test/org/argeo/slc/diff/LineTokenizerTest.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/test/java/org/argeo/slc/diff/LineTokenizerTest.java rename to org.argeo.slc.support/ext/test/org/argeo/slc/diff/LineTokenizerTest.java diff --git a/org.argeo.slc.support/pom.xml b/org.argeo.slc.support/pom.xml index ae6582536..f00bc0dd3 100644 --- a/org.argeo.slc.support/pom.xml +++ b/org.argeo.slc.support/pom.xml @@ -8,4 +8,12 @@ org.argeo.slc.support SLC Third Party Support + + + + org.argeo.slc + org.argeo.slc.core + 2.1.1-SNAPSHOT + + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DataInterpreter.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DataInterpreter.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DataInterpreter.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DataInterpreter.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/Diff.java b/org.argeo.slc.support/src/org/argeo/slc/diff/Diff.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/Diff.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/Diff.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffIssue.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffIssue.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffIssue.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DiffIssue.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffIssueKey.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffIssueKey.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffIssueKey.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DiffIssueKey.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffKey.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffKey.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffKey.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DiffKey.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffMissing.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffMissing.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffMissing.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DiffMissing.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffMissingXml.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffMissingXml.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffMissingXml.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DiffMissingXml.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffNotMatched.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffNotMatched.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffNotMatched.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DiffNotMatched.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffPosition.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffPosition.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffPosition.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DiffPosition.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffResult.java b/org.argeo.slc.support/src/org/argeo/slc/diff/DiffResult.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/DiffResult.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/DiffResult.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/KeyColumnsDiff.java b/org.argeo.slc.support/src/org/argeo/slc/diff/KeyColumnsDiff.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/KeyColumnsDiff.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/KeyColumnsDiff.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/LineTokenizer.java b/org.argeo.slc.support/src/org/argeo/slc/diff/LineTokenizer.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/LineTokenizer.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/LineTokenizer.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/RelatedFile.java b/org.argeo.slc.support/src/org/argeo/slc/diff/RelatedFile.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/RelatedFile.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/RelatedFile.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/TableDiffPosition.java b/org.argeo.slc.support/src/org/argeo/slc/diff/TableDiffPosition.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/TableDiffPosition.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/TableDiffPosition.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/Tolerance.java b/org.argeo.slc.support/src/org/argeo/slc/diff/Tolerance.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/Tolerance.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/Tolerance.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/ToleranceDiff.java b/org.argeo.slc.support/src/org/argeo/slc/diff/ToleranceDiff.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/ToleranceDiff.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/ToleranceDiff.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/XPathDiffPosition.java b/org.argeo.slc.support/src/org/argeo/slc/diff/XPathDiffPosition.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/XPathDiffPosition.java rename to org.argeo.slc.support/src/org/argeo/slc/diff/XPathDiffPosition.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/package.html b/org.argeo.slc.support/src/org/argeo/slc/diff/package.html similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/diff/package.html rename to org.argeo.slc.support/src/org/argeo/slc/diff/package.html diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/AbstractJschTask.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/CallbackHandlerUserInfo.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/CallbackHandlerUserInfo.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/CallbackHandlerUserInfo.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/CallbackHandlerUserInfo.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschContextSession.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/JschContextSession.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschContextSession.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/JschContextSession.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschExecutor.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/JschExecutor.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschExecutor.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/JschExecutor.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschMultiTasks.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/JschMultiTasks.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschMultiTasks.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/JschMultiTasks.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/RemoteExec.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/RemoteExec.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/RemoteExec.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/RemoteExec.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/ScpFrom.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpFrom.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/ScpFrom.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/ScpFrom.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/ScpTo.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpTo.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/ScpTo.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/ScpTo.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SimpleUserInfo.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/SimpleUserInfo.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SimpleUserInfo.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/SimpleUserInfo.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshFilesDeployment.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/SshFilesDeployment.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshFilesDeployment.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/SshFilesDeployment.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshShell.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/SshShell.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshShell.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/SshShell.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshTarget.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/SshTarget.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SshTarget.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/SshTarget.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SwingUserInfo.java b/org.argeo.slc.support/src/org/argeo/slc/jsch/SwingUserInfo.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/SwingUserInfo.java rename to org.argeo.slc.support/src/org/argeo/slc/jsch/SwingUserInfo.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java b/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java similarity index 96% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java index c63bdf026..d2bb56b2e 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java +++ b/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java @@ -32,11 +32,11 @@ import javax.jcr.SimpleCredentials; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSelectInfo; -import org.apache.commons.vfs.FileSelector; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemManager; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSelectInfo; +import org.apache.commons.vfs2.FileSelector; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemManager; import org.argeo.jcr.ArgeoJcrUtils; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/DefaultRedhatDeploymentData.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/DefaultRedhatDeploymentData.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/DefaultRedhatDeploymentData.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/DefaultRedhatDeploymentData.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/DefaultRpmDistribution.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/DefaultRpmDistribution.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/DefaultRpmDistribution.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/DefaultRpmDistribution.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/DeployLxcContainer.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/DeployLxcContainer.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/DeployLxcContainer.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/DeployLxcContainer.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/RedhatDeploymentData.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/RedhatDeploymentData.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/RedhatDeploymentData.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/RedhatDeploymentData.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/RedhatHostManager.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/RedhatHostManager.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/RedhatHostManager.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/RedhatHostManager.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/RpmDistribution.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/RpmDistribution.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/RpmDistribution.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/RpmDistribution.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/ScriptCall.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/ScriptCall.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/ScriptCall.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/ScriptCall.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/SimpleLinuxHost.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/SimpleLinuxHost.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/SimpleLinuxHost.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/SimpleLinuxHost.java diff --git a/org.argeo.slc.support/src/org/argeo/slc/lib/linux/lxc-init-guest.sh b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/lxc-init-guest.sh new file mode 100644 index 000000000..11ecc4e61 --- /dev/null +++ b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/lxc-init-guest.sh @@ -0,0 +1,29 @@ +echo demo | passwd root --stdin + +#Fix root login on console +echo "pts/0" >>/etc/securetty +sed -i s/"session required pam_selinux.so close"/"#session required pam_selinux.so close"/g /etc/pam.d/login +sed -i s/"session required pam_selinux.so open"/"#session required pam_selinux.so open"/g /etc/pam.d/login +sed -i s/"session required pam_loginuid.so"/"#session required pam_loginuid.so"/g /etc/pam.d/login + +#Configuring basic networking +cat > /etc/sysconfig/network << EOF +NETWORKING=yes +HOSTNAME=demo +EOF +cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF +DEVICE=eth0 +BOOTPROTO=dhcp +ONBOOT=yes +EOF + +#Enabling sshd +chkconfig sshd on + +# Fixing root login for sshd +sed -i s/"session required pam_selinux.so close"/"#session required pam_selinux.so close"/g /etc/pam.d/sshd +sed -i s/"session required pam_loginuid.so"/"#session required pam_loginuid.so"/g /etc/pam.d/sshd +sed -i s/"session required pam_selinux.so open env_params"/"#session required pam_selinux.so open env_params"/g /etc/pam.d/sshd + +# Leaving the chroot'ed filesystem +exit \ No newline at end of file diff --git a/org.argeo.slc.support/src/org/argeo/slc/lib/linux/lxc-init-host.sh b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/lxc-init-host.sh new file mode 100644 index 000000000..9e0d75db2 --- /dev/null +++ b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/lxc-init-host.sh @@ -0,0 +1,8 @@ +#!/bin/sh +CHROOT=$1 +echo Init LXC container $CHROOT + +mkdir $CHROOT/etc/yum.repos.d/ -p +cat /etc/yum.repos.d/CentOS-Base.repo |sed s/'$releasever'/6/g > $CHROOT/etc/yum.repos.d/CentOS-Base.repo +yum groupinstall core --installroot=$CHROOT --nogpgcheck -y +yum install plymouth libselinux-python --installroot=$CHROOT --nogpgcheck -y \ No newline at end of file diff --git a/org.argeo.slc.support/src/org/argeo/slc/lib/linux/redhat.xml b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/redhat.xml new file mode 100644 index 000000000..8379b8a10 --- /dev/null +++ b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/redhat.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + authconfig + --enableldap + --enableldapauth + --enablecache + --enablemkhomedir + --ldapserver=@{ldapserver} + --ldapbasedn=@{ldapbasedn} + --passalgo=sha256 + --updateall + + + + + + + + \ No newline at end of file diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/ImportSrpm.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/ImportSrpm.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/ImportSrpm.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/ImportSrpm.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/RpmBuildEnvironment.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/RpmSpecFile.java b/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/RpmSpecFile.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/linux/rpmfactory/RpmSpecFile.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/RpmSpecFile.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/svn/SvnKitDriver.java b/org.argeo.slc.support/src/org/argeo/slc/lib/svn/SvnKitDriver.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/svn/SvnKitDriver.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/svn/SvnKitDriver.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/vbox/VBoxMachine.java b/org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxMachine.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/vbox/VBoxMachine.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxMachine.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/vbox/VBoxManager.java b/org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxManager.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/vbox/VBoxManager.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxManager.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/vbox/VBoxNat.java b/org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxNat.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/vbox/VBoxNat.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxNat.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/vbox/VBoxPortMapping.java b/org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxPortMapping.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/vbox/VBoxPortMapping.java rename to org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxPortMapping.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/log4j/SlcExecutionAppender.java b/org.argeo.slc.support/src/org/argeo/slc/log4j/SlcExecutionAppender.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/log4j/SlcExecutionAppender.java rename to org.argeo.slc.support/src/org/argeo/slc/log4j/SlcExecutionAppender.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/mail/SendMail.java b/org.argeo.slc.support/src/org/argeo/slc/mail/SendMail.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/mail/SendMail.java rename to org.argeo.slc.support/src/org/argeo/slc/mail/SendMail.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationTargetData.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServer.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServer.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServer.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerDeployment.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeployment.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerDeployment.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerDeploymentData.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerManager.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerManager.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerManager.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerTargetData.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerTargetData.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/HttpdServerTargetData.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerTargetData.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/SimpleHttpdApplication.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/SimpleHttpdApplication.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/SimpleHttpdApplication.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/SimpleHttpdApplication.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebApplication.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/WebApplication.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebApplication.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/WebApplication.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebServer.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/WebServer.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/WebServer.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/WebServer.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbModel.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/db/DbModel.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/DbModel.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/db/DbModel.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/JdbcAware.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/db/JdbcAware.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/JdbcAware.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/db/JdbcAware.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java b/org.argeo.slc.support/src/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java similarity index 100% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java rename to org.argeo.slc.support/src/org/argeo/slc/support/deploy/db/SimpleJdbcDatabase.java diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResource.java b/org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResource.java similarity index 93% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResource.java rename to org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResource.java index df4a23308..920fb8b49 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResource.java +++ b/org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResource.java @@ -23,9 +23,9 @@ import java.net.URISyntaxException; import java.net.URL; import org.apache.commons.io.IOExceptionWithCause; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.NameScope; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.NameScope; import org.argeo.slc.SlcException; import org.springframework.core.io.Resource; @@ -105,4 +105,7 @@ public class VfsResource implements Resource { return fileObject; } + public long contentLength(){ + return -1; + } } diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResourceFactory.java b/org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResourceFactory.java similarity index 90% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResourceFactory.java rename to org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResourceFactory.java index d40165859..6a3b6cab2 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResourceFactory.java +++ b/org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResourceFactory.java @@ -15,9 +15,9 @@ */ package org.argeo.slc.vfs; -import org.apache.commons.vfs.CacheStrategy; -import org.apache.commons.vfs.FileSystemManager; -import org.apache.commons.vfs.impl.StandardFileSystemManager; +import org.apache.commons.vfs2.CacheStrategy; +import org.apache.commons.vfs2.FileSystemManager; +import org.apache.commons.vfs2.impl.StandardFileSystemManager; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.io.Resource; diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResourceSet.java b/org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResourceSet.java similarity index 91% rename from runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResourceSet.java rename to org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResourceSet.java index d8d79fe01..8adb27629 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/vfs/VfsResourceSet.java +++ b/org.argeo.slc.support/src/org/argeo/slc/vfs/VfsResourceSet.java @@ -18,10 +18,10 @@ package org.argeo.slc.vfs; import java.util.HashMap; import java.util.Map; -import org.apache.commons.vfs.FileObject; -import org.apache.commons.vfs.FileSystemException; -import org.apache.commons.vfs.FileSystemManager; -import org.apache.commons.vfs.VFS; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.commons.vfs2.FileSystemManager; +import org.apache.commons.vfs2.VFS; import org.argeo.slc.SlcException; import org.argeo.slc.core.deploy.ResourceSet; import org.springframework.core.io.Resource; diff --git a/pom.xml b/pom.xml index 91d640de5..6c15049a6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,11 +14,14 @@ 2.1 2015-02-12 2.1.1-SNAPSHOT + + 2.1.5 org.argeo.slc.api org.argeo.slc.core org.argeo.slc.unit + org.argeo.slc.repo @@ -117,7 +120,35 @@ limitations under the License. warn + + + argeo-tp-extras-local + http://localhost:7080/data/public/java/argeo-tp-extras-2.1 + + true + daily + warn + + + + + org.argeo.tp.extras + argeo-tp-extras + ${version.argeo-tp-extras} + provided + + staging -- 2.39.2