Merge repo.cnd into slc.cnd.
authorMathieu Baudier <mbaudier@argeo.org>
Mon, 13 Nov 2017 11:56:09 +0000 (12:56 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Mon, 13 Nov 2017 11:56:09 +0000 (12:56 +0100)
Move SLC names and types to API. (API breaking change)

83 files changed:
org.argeo.slc.api/bnd.bnd
org.argeo.slc.api/src/org/argeo/slc/SlcNames.java [new file with mode: 0644]
org.argeo.slc.api/src/org/argeo/slc/SlcTypes.java [new file with mode: 0644]
org.argeo.slc.api/src/org/argeo/slc/slc.cnd [new file with mode: 0644]
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistConstants.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java
org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/ClientUiPlugin.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessLogPage.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultFolder.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparator.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParentUtils.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/SingleResultNode.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/VirtualFolder.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultListView.java
org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
org.argeo.slc.core/bnd.bnd
org.argeo.slc.core/src/org/argeo/slc/core/execution/http/RunnerServlet.java
org.argeo.slc.core/src/org/argeo/slc/jcr/JcrMetadataWriter.java
org.argeo.slc.core/src/org/argeo/slc/jcr/JcrTestResult.java
org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrConstants.java
org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java
org.argeo.slc.core/src/org/argeo/slc/jcr/SlcNames.java [deleted file]
org.argeo.slc.core/src/org/argeo/slc/jcr/SlcTypes.java [deleted file]
org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrAgent.java
org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java
org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java
org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java
org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java
org.argeo.slc.core/src/org/argeo/slc/jcr/slc.cnd [deleted file]
org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java
org.argeo.slc.repo/bnd.bnd
org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java
org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java
org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java
org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java
org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java
org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java
org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java
org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java
org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java
org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java
org.argeo.slc.repo/src/org/argeo/slc/repo/repo.cnd

index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1d83c61cb4d1e349f5eef0eb6928ced274d5e4bf 100644 (file)
@@ -0,0 +1,3 @@
+
+
+Provide-Capability: cms.datamodel;name=slc;cnd=/org/argeo/slc/slc.cnd
diff --git a/org.argeo.slc.api/src/org/argeo/slc/SlcNames.java b/org.argeo.slc.api/src/org/argeo/slc/SlcNames.java
new file mode 100644 (file)
index 0000000..7e32059
--- /dev/null
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.slc;
+
+/** JCR names used by SLC */
+public interface SlcNames {
+       public final static String SLC_ = "slc:";
+
+       /*
+        * GENERAL
+        */
+       public final static String SLC_UUID = "slc:uuid";
+       public final static String SLC_STATUS = "slc:status";
+       // generic name for result parts of a given test result (slc:testResult)
+       // note that corresponding nodes can be retrieved using
+       // myTestResultNode.getNodes(SLC_RESULT_PART+"*") method
+       public final static String SLC_RESULT_PART = "slc:resultPart";
+       // Fixed name of the child node of a slc:testResult of type
+       // slc:check that aggregate status of all result parts of a given test
+       // result
+       public final static String SLC_AGGREGATED_STATUS = "slc:aggregatedStatus";
+
+       public final static String SLC_TYPE = "slc:type";
+       public final static String SLC_NAME = "slc:name";
+       public final static String SLC_VERSION = "slc:version";
+       public final static String SLC_CATEGORY = "slc:category";
+       public final static String SLC_VALUE = "slc:value";
+       public final static String SLC_ADDRESS = "slc:address";
+       public final static String SLC_METADATA = "slc:metadata";
+
+       public final static String SLC_TIMESTAMP = "slc:timestamp";
+       public final static String SLC_STARTED = "slc:started";
+       public final static String SLC_COMPLETED = "slc:completed";
+
+       public final static String SLC_VM = "slc:vm";
+       /*
+        * SLC RUNTIME
+        */
+       // execution
+       public final static String SLC_SPEC = "slc:spec";
+       public final static String SLC_EXECUTION_SPECS = "slc:executionSpecs";
+       public final static String SLC_FLOW = "slc:flow";
+       public final static String SLC_LOG = "slc:log";
+       public final static String SLC_AGENTS = "slc:agents";
+
+       // spec attribute
+       public final static String SLC_IS_IMMUTABLE = "slc:isImmutable";
+       public final static String SLC_IS_CONSTANT = "slc:isConstant";
+       public final static String SLC_IS_HIDDEN = "slc:isHidden";
+
+       // base directories
+       public final static String SLC_SYSTEM = "slc:system";
+       public final static String SLC_RESULTS = "slc:results";
+       public final static String SLC_MY_RESULTS = "slc:myResults";
+       public final static String SLC_PROCESSES = "slc:processes";
+
+       // result
+       public final static String SLC_SUCCESS = "slc:success";
+       public final static String SLC_MESSAGE = "slc:message";
+       public final static String SLC_TAG = "slc:tag";
+       public final static String SLC_ERROR_MESSAGE = "slc:errorMessage";
+       public final static String SLC_TEST_CASE = "slc:testCase";
+       public final static String SLC_TEST_CASE_TYPE = "slc:testCaseType";
+
+       // diff result
+       public final static String SLC_SUMMARY = "slc:summary";
+       public final static String SLC_ISSUES = "slc:issues";
+
+       /*
+        * SLC REPO
+        */
+       // shared
+       public final static String SLC_URL = "slc:url";
+       public final static String SLC_OPTIONAL = "slc:optional";
+       public final static String SLC_AS_STRING = "slc:asString";
+
+       // origin
+       public final static String SLC_ORIGIN = "slc:origin";
+       public final static String SLC_PROXY = "slc:proxy";
+
+       // slc:artifact
+       public final static String SLC_ARTIFACT_ID = "slc:artifactId";
+       public final static String SLC_GROUP_ID = "slc:groupId";
+       public final static String SLC_GROUP_BASE_ID = "slc:groupBaseId";
+       public final static String SLC_ARTIFACT_VERSION = "slc:artifactVersion";
+       public final static String SLC_ARTIFACT_EXTENSION = "slc:artifactExtension";
+       public final static String SLC_ARTIFACT_CLASSIFIER = "slc:artifactClassifier";
+
+       // slc:jarArtifact
+       public final static String SLC_MANIFEST = "slc:manifest";
+
+       // shared OSGi
+       public final static String SLC_SYMBOLIC_NAME = "slc:symbolic-name";
+       public final static String SLC_BUNDLE_VERSION = "slc:bundle-version";
+
+       // slc:osgiBaseVersion
+       public final static String SLC_MAJOR = "slc:major";
+       public final static String SLC_MINOR = "slc:minor";
+       public final static String SLC_MICRO = "slc:micro";
+       // slc:osgiVersion
+       public final static String SLC_QUALIFIER = "slc:qualifier";
+
+       // slc:exportedPackage
+       public final static String SLC_USES = "slc:uses";
+
+       // slc:modularDistribution
+       public final static String SLC_MODULES = "slc:modules";
+
+       // RPM
+       // slc:rpm
+       public final static String SLC_RPM_VERSION = "slc:rpmVersion";
+       public final static String SLC_RPM_RELEASE = "slc:rpmRelease";
+       public final static String SLC_RPM_ARCH = "slc:rpmArch";
+       public final static String SLC_RPM_ARCHIVE_SIZE = "slc:rpmArchiveSize";
+}
diff --git a/org.argeo.slc.api/src/org/argeo/slc/SlcTypes.java b/org.argeo.slc.api/src/org/argeo/slc/SlcTypes.java
new file mode 100644 (file)
index 0000000..d807aad
--- /dev/null
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.slc;
+
+/** JCR node types used by SLC */
+public interface SlcTypes {
+
+       public final static String SLC_NAME_VERSION = "slc:nameVersion";
+       public final static String SLC_CATEGORIZED_NAME_VERSION = "slc:categorizedNameVersion";
+
+       public final static String SLC_AGENT_FACTORY = "slc:agentFactory";
+       public final static String SLC_AGENT = "slc:agent";
+       public final static String SLC_MODULE = "slc:module";
+       public final static String SLC_EXECUTION_MODULE = "slc:executionModule";
+       public final static String SLC_EXECUTION_SPEC = "slc:executionSpec";
+       public final static String SLC_EXECUTION_FLOW = "slc:executionFlow";
+       public final static String SLC_PROCESS = "slc:process";
+       public final static String SLC_REALIZED_FLOW = "slc:realizedFlow";
+
+       public final static String SLC_EXECUTION_SPEC_ATTRIBUTE = "slc:executionSpecAttribute";
+       public final static String SLC_PRIMITIVE_SPEC_ATTRIBUTE = "slc:primitiveSpecAttribute";
+       public final static String SLC_REF_SPEC_ATTRIBUTE = "slc:refSpecAttribute";
+
+       public final static String SLC_TEST_RESULT = "slc:testResult";
+       public final static String SLC_CHECK = "slc:check";
+       public final static String SLC_PROPERTY = "slc:property";
+       public final static String SLC_DIFF_RESULT = "slc:diffResult";
+
+       // Node types used for user defined and managed result UI tree
+       public final static String SLC_MY_RESULT_ROOT_FOLDER = "slc:myResultRootFolder";
+       public final static String SLC_RESULT_FOLDER = "slc:resultFolder";
+
+       // Log levels
+       public final static String SLC_LOG_ENTRY = "slc:logEntry";
+       public final static String SLC_LOG_TRACE = "slc:logTrace";
+       public final static String SLC_LOG_DEBUG = "slc:logDebug";
+       public final static String SLC_LOG_INFO = "slc:logInfo";
+       public final static String SLC_LOG_WARNING = "slc:logWarning";
+       public final static String SLC_LOG_ERROR = "slc:logError";
+
+       /*
+        * REPO
+        */
+       public final static String SLC_ARTIFACT = "slc:artifact";
+       public final static String SLC_ARTIFACT_VERSION_BASE = "slc:artifactVersion";
+       public final static String SLC_ARTIFACT_BASE = "slc:artifactBase";
+       public final static String SLC_GROUP_BASE = "slc:groupBase";
+       public final static String SLC_JAR_FILE = "slc:jarFile";
+       public final static String SLC_BUNDLE_ARTIFACT = "slc:bundleArtifact";
+       public final static String SLC_OSGI_VERSION = "slc:osgiVersion";
+       public final static String SLC_JAVA_PACKAGE = "slc:javaPackage";
+       public final static String SLC_EXPORTED_PACKAGE = "slc:exportedPackage";
+       public final static String SLC_IMPORTED_PACKAGE = "slc:importedPackage";
+       public final static String SLC_DYNAMIC_IMPORTED_PACKAGE = "slc:dynamicImportedPackage";
+       public final static String SLC_REQUIRED_BUNDLE = "slc:requiredBundle";
+       public final static String SLC_FRAGMENT_HOST = "slc:fragmentHost";
+
+       // Distribution management
+       // public final static String SLC_CATEGORY = "slc:category";
+       public final static String SLC_MODULAR_DISTRIBUTION_BASE = "slc:modularDistributionBase";
+       public final static String SLC_MODULAR_DISTRIBUTION = "slc:modularDistribution";
+       public final static String SLC_MODULE_COORDINATES = "slc:moduleCoordinates";
+
+       // origin
+       public final static String SLC_KNOWN_ORIGIN = "slc:knownOrigin";
+       public final static String SLC_PROXIED = "slc:proxied";
+
+       // rpm
+       public final static String SLC_RPM = "slc:rpm";
+}
diff --git a/org.argeo.slc.api/src/org/argeo/slc/slc.cnd b/org.argeo.slc.api/src/org/argeo/slc/slc.cnd
new file mode 100644 (file)
index 0000000..ed4a160
--- /dev/null
@@ -0,0 +1,294 @@
+<slc = 'http://www.argeo.org/ns/slc'>
+
+// COMMON
+[slc:nameVersion] > nt:base
+mixin
+- slc:name (STRING) m
+- slc:version (STRING) m
+
+[slc:categorizedNameVersion] > slc:nameVersion
+mixin
+// define as mandatory?
+- slc:category (STRING)
+
+// AGENT
+[slc:agentFactory] > nt:unstructured, mix:title
++ * (slc:agent)
+
+[slc:agent] > nt:unstructured, mix:title
++ * (slc:module)
+
+[slc:module] > slc:nameVersion, mix:title
+mixin
+
+[slc:activableModule] > slc:module
+mixin
+
+[slc:executionModule] > slc:activableModule
+mixin
+
+[slc:executionSpec] > nt:unstructured, mix:referenceable, mix:title
+- slc:name (STRING) m
++ * (slc:executionSpecAttribute) *
+
+[slc:executionSpecAttribute] > nt:base
+mixin abstract
+- slc:isImmutable (BOOLEAN) 
+- slc:isConstant (BOOLEAN) 
+- slc:isHidden (BOOLEAN) 
+
+[slc:primitiveSpecAttribute] > slc:executionSpecAttribute
+mixin
+- slc:type (STRING) 
+- slc:value (UNDEFINED)
+
+[slc:refSpecAttribute] > slc:executionSpecAttribute
+orderable
+mixin
+// typically a class name
+- slc:type (STRING)
+- slc:value (UNDEFINED)
++ * (mix:title)
+
+[slc:executionFlow] > nt:unstructured, mix:title
+- slc:name (STRING) ! m
+// if the execution spec is a referenceable node
+- slc:spec (REFERENCE)
+// if the execution spec is internal (without name)
++ * (slc:executionSpecAttribute) *
+
+// PROCESS
+[slc:process] > nt:unstructured, mix:created, mix:lastModified
+orderable
+- slc:uuid (STRING) ! m
+- slc:status (STRING) m
++ slc:flow (slc:realizedFlow)
++ slc:log
+
+// The first part of the relative path is the thread name, rest is location
+[slc:logEntry] > nt:unstructured
+abstract
+- slc:message (STRING) !
+- slc:timestamp (STRING)
+
+// Log levels are set via types.
+// Querying one level also queries the higher levels thanks to the inheritance
+// e.g. 'select * from [slc:logWarn]' also returns errors 
+[slc:logTrace] > slc:logEntry
+
+[slc:logDebug] > slc:logTrace
+
+[slc:logInfo] > slc:logDebug
+
+[slc:logWarning] > slc:logInfo
+
+[slc:logError] > slc:logWarning
+
+[slc:realizedFlow] > nt:base
+orderable
+mixin
+// the name of the flow
+// - slc:flow (STRING)
+// the name of the execution spec
+// - slc:spec (STRING)
+- slc:started (DATE)
+- slc:completed (DATE)
+//- slc:status (STRING)
++ slc:address (nt:address)
++ slc:flow (slc:realizedFlow) *
+// the realized execution spec attributes
++ * (slc:executionSpecAttribute) *
+
+// RESULT
+[slc:testResult] > nt:unstructured, mix:created, mix:lastModified
+- slc:uuid (STRING) ! m
+- slc:testCase (STRING)
+- slc:completed (DATE)
+// Helper to keep a centralize place to have testResultStatus
+// when adding more than one result part to a given testResult 
++ slc:aggregatedStatus (slc:check)
+// DEPRECATED - FOR COMPATIBILITY - DO NOT USE
++ slc:testStatus (slc:check)
+
+[slc:diffResult] > slc:testResult
++ slc:summary
++ slc:issues
+
+[slc:resultFolder] > nt:unstructured
++ slc:folderStatus (slc:check)
++ * (slc:resultFolder) *
++ * (slc:testResult) *
+
+// base node for user defined and managed result tree
+// simplify UI management
+[slc:myResultRootFolder] > nt:unstructured
++ * (slc:resultFolder) *
++ * (slc:testResult) *
+
+[slc:check] > nt:unstructured
+// true for PASSED, false for FAILED or ERROR
+- slc:success (BOOLEAN) ! m
+- slc:message (STRING)
+// ERROR if set, the check could not be performed because of an unexpected exception
+- slc:errorMessage (STRING)
+// to ease transition with legacy approach
++ * (slc:property) *
+
+[slc:property] > nt:unstructured
+- slc:name (STRING) ! m
+- slc:value (STRING) m
+
+//
+// DISTRIBUTION
+//
+
+// 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
+
+[slc:modularDistributionBase]
+mixin
+
+[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:rpmArchiveSize (STRING)
+// TYPO - TO BE REMOVED
+- slc:rpmArchivaeSize (STRING)
+
index 589f660cd7aba8e946440294052319d26c7111f6..bcbceddbf582b7fb834624b1708e881feaf13b48 100644 (file)
@@ -15,7 +15,7 @@
  */
 package org.argeo.slc.client.ui.dist;
 
-import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.SlcNames;
 import org.osgi.framework.Constants;
 
 /** Constants used across the application. */
index 61a7c9b7fe31a81d6d8dc37533d407cc7e7b8296..18c0473ecdfbe220907b537a0b0c788bd6a9e792 100644 (file)
@@ -21,8 +21,8 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
index c55efb65d109e9a71ec921237f3ba93a3e47e951..ab4f333031d5acfe642e7305bd6eb82c62fdc7d5 100644 (file)
@@ -37,10 +37,10 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.node.security.Keyring;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.aether.AetherUtils;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.JarFileIndexer;
 import org.argeo.slc.repo.RepoConstants;
index da1af58541be501d5ac09040b65feb4a5e170012..de82a3e2fddc7b28b686666c5d0cc8458a112327 100644 (file)
@@ -34,8 +34,8 @@ import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.JarFileIndexer;
 import org.argeo.slc.repo.ModularDistributionIndexer;
index 918778249a8fd04045686c9ba940232d9124ed28..6abbb32fdf17c13eee983df2ba625ee6ddee2e93 100644 (file)
@@ -21,11 +21,11 @@ import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.editors.ArtifactVersionEditor;
 import org.argeo.slc.client.ui.dist.editors.ModularDistVersionEditor;
 import org.argeo.slc.client.ui.dist.editors.ModuleEditorInput;
-import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoService;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
index 1adb2a345cd843bfcb6aad15611f8b625f246084..2dbd3377d43d7bbcf8c9da43ede4c83c1d35a545 100644 (file)
@@ -20,10 +20,10 @@ import javax.jcr.RepositoryFactory;
 
 import org.argeo.cms.ArgeoNames;
 import org.argeo.node.security.Keyring;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.argeo.slc.client.ui.dist.wizards.RegisterRepoWizard;
-import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
index 21cb95ca094afae6257ea8e683f036501e58fc64..1b9022fd7520e2e12ef661bbe16cbea4be9195aa 100644 (file)
@@ -34,9 +34,9 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.core.execution.tasks.JvmProcess;
-import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
 import org.eclipse.aether.artifact.Artifact;
index 728407f66334b6e82e90cd84d05bfc0e7d83ecc7..7e0b491158e6ead1bb38df76c4967c73b6996e59 100644 (file)
@@ -24,9 +24,9 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ViewerCell;
 import org.eclipse.swt.graphics.Image;
index ac3459e95d4140e2723ac40162b2b612bf699cb0..d301bee280e3166112440f2ce42fe49ec41cecf3 100644 (file)
@@ -25,7 +25,7 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.eclipse.ui.jcr.utils.JcrItemsComparator;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcTypes;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
index 1db3661267a0cda2d33c9503ffb1a7caa0b22f2a..4ae23b1ede1917f3ea24e9702120e717b0a1aef7 100644 (file)
@@ -21,8 +21,8 @@ import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.RepoService;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
index 60d17c5a86486463da14337cccaf15ddbb1fe69a..3fd0fecdf2e12331eb3ad9292b0c8a3c6c5a9cc2 100644 (file)
@@ -24,10 +24,10 @@ import javax.jcr.RepositoryException;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
index c73e16eb3d85860ab5564e2dd25a65fb12412b2a..466358bc00b85d51364ecda4f00b5f56ddd706f0 100644 (file)
@@ -23,12 +23,10 @@ import javax.jcr.RepositoryException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.build.License;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.utils.HyperlinkAdapter;
-//import org.argeo.slc.client.ui.specific.OpenJcrFile;
-//import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId;
-import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
 import org.eclipse.jface.dialogs.IMessageProvider;
index 5001886f364983742a3d8f9372deea3241e8a2fb..c201f4e3bd319bdc28328803bc809cca72601cd5 100644 (file)
@@ -27,10 +27,10 @@ import javax.jcr.Value;
 import javax.jcr.nodetype.NodeType;
 
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.utils.DistUiHelpers;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
index a9cfe3822b0d628a93f8cbae2c0168dd40e5acd3..2919841bb45dfff7a17b32f6c4c328282eda621f 100644 (file)
@@ -34,11 +34,11 @@ import javax.jcr.query.qom.Selector;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
index f231813679bfaaccf98d31494c8b8231c2171d31..d4b322d4576de5263b9ee8a51c891d86c7dd8598 100644 (file)
@@ -16,7 +16,7 @@
 package org.argeo.slc.client.ui.dist.editors;
 
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.SlcNames;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
index 3b8b49bce72e3a0d8d2437ebf6b52ec165d187d4..caba3c941952f145e4fd10c46190b48744364f43 100644 (file)
@@ -43,13 +43,13 @@ import org.argeo.eclipse.ui.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.commands.DeleteArtifacts;
 import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor;
 import org.argeo.slc.client.ui.dist.utils.DistNodeViewerComparator;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
index 06e892f028b42050d1b6d17ec1bab268b3afb85e..5e9afae81832016f0294f7817759f98a5777968f 100644 (file)
@@ -24,8 +24,8 @@ import javax.jcr.Session;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.security.Keyring;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.repo.RepoUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
index 396950498d1b10cbd257f1c51a10850768fe4356..e2b8e79406f6fbedb10277cfb2b79bf95fc1de73 100644 (file)
@@ -19,7 +19,7 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.SlcNames;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
index c870baf1c1f19b89c8e9970b22d7989a2fb1f48b..0bd922fa28414e6b3ee2fa2e6e3f718bd405259a 100644 (file)
@@ -41,15 +41,13 @@ import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor;
 import org.argeo.slc.client.ui.dist.utils.DistNodeViewerComparator;
 import org.argeo.slc.client.ui.dist.utils.HyperlinkAdapter;
-//import org.argeo.slc.client.ui.specific.OpenJcrFile;
-//import org.argeo.slc.client.ui.specific.OpenJcrFileCmdId;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
index bcb0b2a22a211803122f3fe3a573d21cb93d6291..eddfdd02c933f6065b76838f7764a8c46daa3c73 100644 (file)
@@ -17,7 +17,7 @@ package org.argeo.slc.client.ui.dist.editors;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.SlcNames;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
index 9259971deb13ce87b48c75812f4fcf888ca4c76a..04f706e98a3febf689057390b5b9dc157effe6be 100644 (file)
@@ -18,7 +18,7 @@ package org.argeo.slc.client.ui.dist.editors;
 import javax.jcr.Node;
 
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.SlcNames;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
index ade3c2d73c2dc39dbc9224b03a4155120c33651d..e92db49dc485880c0b4e4c6bb3801996f4de4f5c 100644 (file)
@@ -39,14 +39,14 @@ import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.commands.OpenGenerateBinariesWizard;
 import org.argeo.slc.client.ui.dist.commands.OpenModuleEditor;
 import org.argeo.slc.client.ui.dist.utils.DistNodeViewerComparator;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
index 1040e2c4e424d0753a187e612555bf647b235481..4ee0b59f32174fd112a3d64146835b5cf8c2fc4e 100644 (file)
@@ -11,8 +11,8 @@ import javax.jcr.query.qom.QueryObjectModelFactory;
 import javax.jcr.query.qom.Selector;
 
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 
 /**
  * Abstract the base of a given modular distribution set i.e. the parent of all
index 40409dc8477966855f18fcca6d70b035b5340651..4c78511bc5fc314f08981d1b677d4c40b3b2785a 100644 (file)
@@ -12,8 +12,8 @@ import javax.jcr.query.qom.Selector;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 
 /** Abstract a workspace that contains a software distribution */
 public class WorkspaceElem extends DistParentElem {
index a8a321cf4458056150e84eb242449ee890b24202..a3579422261d307e03740829d7d747418a8bc8a5 100644 (file)
@@ -27,9 +27,9 @@ import javax.jcr.query.Row;
 
 import org.argeo.eclipse.ui.GenericTableComparator;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
index 2820d929453819a9f9bbc0af9a081ceb4536f337..5a5e4b331a5c6d8042abd8cc767860d5484c840b 100644 (file)
@@ -26,9 +26,9 @@ import javax.jcr.Value;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 
 public class DistUiHelpers implements DistConstants, SlcTypes, SlcNames {
        private final static Log log = LogFactory.getLog(DistUiHelpers.class);
index ceff72d106783a8af61c6db7ab77f033f265012f..2a8ff798e5675eb8a80d1868b6a18aa22450db55 100644 (file)
@@ -32,8 +32,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.GenericTableComparator;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.utils.ArtifactsTableConfigurer;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;
index 76967be6a7c4b20b9cebe7e457aa0c43b3355913..b4100cdd7d87659ed204d27ab0f9384063dde96c 100644 (file)
 package org.argeo.slc.client.ui.dist.views;
 
 import org.argeo.cms.ArgeoNames;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.controllers.DistTreeComparator;
 import org.argeo.slc.client.ui.dist.controllers.DistTreeDoubleClickListener;
 import org.argeo.slc.client.ui.dist.controllers.DistTreeLabelProvider;
-import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
index 6f61714364b16bd328d5e8c9f320fbf60ea2cf57..323159d4331d4b4712f47d325c8ead14a0100157 100644 (file)
@@ -25,11 +25,11 @@ import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistConstants;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.controllers.ArtifactsTreeContentProvider;
-import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ISelection;
index 217ab493cf3b4c4a9275e475bee0d4bd18f81c20..1c52cf775cc19ec137a30247227ba21b50023e69 100644 (file)
@@ -25,6 +25,7 @@ import org.argeo.cms.ArgeoNames;
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.commands.CopyLocalJavaWorkspace;
 import org.argeo.slc.client.ui.dist.commands.CopyWorkspace;
@@ -51,7 +52,6 @@ import org.argeo.slc.client.ui.dist.model.ModularDistVersionElem;
 import org.argeo.slc.client.ui.dist.model.RepoElem;
 import org.argeo.slc.client.ui.dist.model.WkspGroupElem;
 import org.argeo.slc.client.ui.dist.model.WorkspaceElem;
-import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
index 1db52456d25fbd8818614b29575826ef14d7bc4b..791fbc70a136cc9ff8319320a6ad17cbcce388f7 100644 (file)
@@ -16,8 +16,8 @@
 package org.argeo.slc.client.ui.dist.views;
 
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
index b48018cce279f2b4d90b2b40c96fd461dc3a8621..35333e4d24a1183ab02734731de2e5f0de7ef583 100644 (file)
@@ -15,8 +15,8 @@
  */
 package org.argeo.slc.client.ui.dist.views;
 
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
index ee5fbdb64bfb9451b822b4273284f07b3499704f..baeeddc2cca72523984dd2ef2f8c27c8c987a8e2 100644 (file)
@@ -16,9 +16,9 @@
 package org.argeo.slc.client.ui.dist.views;
 
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistPlugin;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.layout.FillLayout;
index 5df19d62835ec87c86d748cbfaa1e2a40fbe55eb..5b4ea21c248ec5e18ced2adbbe186c7280553cff 100644 (file)
@@ -30,9 +30,9 @@ import org.argeo.eclipse.ui.EclipseJcrMonitor;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.utils.ViewerUtils;
-import org.argeo.slc.jcr.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoService;
 import org.argeo.slc.repo.RepoUtils;
index 936965f7b4b21a0719ea415b4775eaf442216728..05e57e9f1eae92f03fe31993263c3923a2268fa3 100644 (file)
@@ -21,9 +21,9 @@ import javax.jcr.RepositoryException;
 import org.argeo.slc.BasicNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.deploy.ModulesManager;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
index 7843dc2ba91535dfebbeb63c453498197faf4b3f..4def5f4e0ed764ca09f14734fcc35441fe4bc5c0 100644 (file)
@@ -26,9 +26,9 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.BasicNameVersion;\r
 import org.argeo.slc.NameVersion;\r
 import org.argeo.slc.SlcException;\r
+import org.argeo.slc.SlcNames;\r
+import org.argeo.slc.SlcTypes;\r
 import org.argeo.slc.deploy.ModulesManager;\r
-import org.argeo.slc.jcr.SlcNames;\r
-import org.argeo.slc.jcr.SlcTypes;\r
 import org.eclipse.core.commands.AbstractHandler;\r
 import org.eclipse.core.commands.ExecutionEvent;\r
 import org.eclipse.core.commands.ExecutionException;\r
index f5a7c98d191acf9eb601a84e3cb3e71b0e259da8..95e728e82a0b995d2c804b7b417eddaef7868703 100644 (file)
@@ -22,13 +22,13 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.client.ui.SlcUiConstants;
 import org.argeo.slc.client.ui.model.ResultFolder;
 import org.argeo.slc.client.ui.model.ResultParent;
 import org.argeo.slc.client.ui.model.SingleResultNode;
-import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.DecorationOverlayIcon;
 import org.eclipse.jface.viewers.IDecoration;
index a38a87f5c07ddc25e1d1b0ba8a23485ee29b7fff..758d761c6cb381a8165212d6fe3fb811c95c11e1 100644 (file)
@@ -35,13 +35,13 @@ import javax.jcr.query.QueryManager;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
 import org.argeo.slc.core.execution.PrimitiveUtils;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.jcr.SlcJcrUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ColumnViewer;
index b2cb8200a525f0e31d51e7a7b6c53fa8699b993f..1e9788e3965cdffcd959cb644e38b5187d5d9853 100644 (file)
@@ -29,13 +29,13 @@ import javax.jcr.Session;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.controllers.ProcessController;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.jcr.SlcJcrUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
index 0fb27e95e98d9be026fa3a883b1b6448995ffac1..bca80f54a1c338c369588c99ff884fbeedef4b73 100644 (file)
@@ -31,9 +31,9 @@ import javax.jcr.query.Query;
 
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.execution.ExecutionStep;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
index 51ffb11182ab545431ad6478f73f82ff40505ad6..b3f6d7dc7e1c2c71ec9f015dc0e21b4e57fd8c25 100644 (file)
@@ -21,8 +21,8 @@ import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;
 
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 
 /**
  * UI Tree component that wrap a node of type NT_UNSTRUCTURED or base node for
index c564492d889f87b6c6febef4e210f5e7a861b8d9..57fc627ac05c69ffa2c827a69a9e26d1da66b673 100644 (file)
@@ -19,7 +19,7 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.SlcNames;
 
 /**
  * UI Tree component that wrap a node of type ResultFolder. list either other
index 30e7baa44a81f062cdd1f011abbfa575b07a4842..74ec9ec738af657449426b36b28e7f14450a5ec6 100644 (file)
@@ -6,8 +6,8 @@ import javax.jcr.RepositoryException;
 
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 
index 2d93b2619cfb7fa1dd4e1c35e0a5bf38b5bb62a7..268d746c16a39987ca71a9ad7bf6f2277c23f482 100644 (file)
@@ -29,9 +29,9 @@ import javax.jcr.query.QueryManager;
 import javax.jcr.query.QueryResult;
 
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.jcr.SlcJcrResultUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 
 public class ResultParentUtils {
        // private final static Log log =
index afd1249898858f82452d877f2b83ebfe55ba1466..d95e0f46adb3e78a16b8a026cbe18ff9941dd669 100644 (file)
@@ -21,7 +21,7 @@ import javax.jcr.Workspace;
 
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.SlcNames;
 
 /**
  * UI Tree component. Wraps a result node of a JCR {@link Workspace}. It also
index 1218060ebebf42ee5e66265a81fa43bea41de35d..d6b7a3b5d46b9e59a495cc82f0c84e4a40c6ec07 100644 (file)
@@ -21,8 +21,8 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 
 /**
  * UI Tree component. Virtual folder to list a list of results. Keeps a
index 697433fe775a6dbf8df4a6de71997dbcd5abf3a4..b92a125d3ea8484367d51bb40d81c4085c655019 100644 (file)
@@ -43,14 +43,14 @@ import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider;
 import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.client.ui.editors.ProcessEditor;
 import org.argeo.slc.client.ui.editors.ProcessEditorInput;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.jcr.SlcJcrConstants;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
index 8ab5c8f6f74dce185f458fff569cd6ccafdbd8d3..18f8a5aee55d5763bd0b8c78640a9cab7acdd886 100644 (file)
@@ -34,14 +34,14 @@ import javax.jcr.query.Query;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.client.ui.editors.ProcessEditor;
 import org.argeo.slc.client.ui.editors.ProcessEditorInput;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.jcr.SlcJcrUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
index 7ff0e200269eec92fb6dbd7c42b62af563b25935..2843c26cdcf9f263252143d002fe64d6ff2d2011 100644 (file)
@@ -34,12 +34,12 @@ import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.eclipse.ui.jcr.NodeElementComparer;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.editors.ProcessEditor;
 import org.argeo.slc.client.ui.editors.ProcessEditorInput;
 import org.argeo.slc.jcr.SlcJcrResultUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
index a7d63413ddae19d549f46d54c8a21131342ef566..ecf7adeb9ed571bf5c4c56108d4dd50e9d579bd0 100644 (file)
@@ -37,6 +37,8 @@ import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;\r
 import org.argeo.jcr.JcrUtils;\r
 import org.argeo.slc.SlcException;\r
+import org.argeo.slc.SlcNames;\r
+import org.argeo.slc.SlcTypes;\r
 import org.argeo.slc.client.ui.ClientUiPlugin;\r
 import org.argeo.slc.client.ui.SlcUiConstants;\r
 import org.argeo.slc.client.ui.commands.AddResultFolder;\r
@@ -57,8 +59,6 @@ import org.argeo.slc.client.ui.model.VirtualFolder;
 import org.argeo.slc.client.ui.providers.ResultTreeContentProvider;\r
 import org.argeo.slc.client.ui.providers.ResultTreeLabelProvider;\r
 import org.argeo.slc.jcr.SlcJcrResultUtils;\r
-import org.argeo.slc.jcr.SlcNames;\r
-import org.argeo.slc.jcr.SlcTypes;\r
 import org.eclipse.jface.action.IMenuListener;\r
 import org.eclipse.jface.action.IMenuManager;\r
 import org.eclipse.jface.action.MenuManager;\r
index ffbb7650749a868118a63b3276c4f1d7b3c0fbd3..5b3c49ffa96255e5ec423c884a1de2b3eeba49b0 100644 (file)
@@ -3,5 +3,3 @@ javax.jcr.security,\
 org.apache.tools.ant.*;resolution:="optional",\
 junit.framework;resolution:="optional",\
 *
-
-Provide-Capability: cms.datamodel;name=slc;cnd=/org/argeo/slc/jcr/slc.cnd
index 4147bad179e8311349e8275969c7b6aa3b29b01d..c467e00139e25db2bc9927661e7527b6f7f525a2 100644 (file)
@@ -36,9 +36,9 @@ import org.argeo.cms.auth.CmsSession;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.NodeUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.execution.ExecutionProcess;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
index 19db9cbf7eda1730e3c6b23ce8d9c1a842de3be4..c4922d3253e7242fa2957ea84aaa4a42f7bb3f2d 100644 (file)
@@ -25,6 +25,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 
 /**
  * Writes arbitrary metadata into a child node of a given node (or the node
index e3394e05cbbda6ecbcd8c11800487512d5b86e2b..c9ec874ea61c0e4274639b8e18b4a38b4c1f7077 100644 (file)
@@ -34,6 +34,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.core.attachment.Attachment;
 import org.argeo.slc.core.attachment.AttachmentsEnabled;
 import org.argeo.slc.test.TestResult;
index 179a081f4d0f86686a9ed3ba88149d52daeb4dad..3190c85b9d91c1e1c28c2e63badc1dad44c4a95e 100644 (file)
@@ -15,6 +15,8 @@
  */
 package org.argeo.slc.jcr;
 
+import org.argeo.slc.SlcNames;
+
 /** JCR related constants used across SLC */
 public interface SlcJcrConstants {
        public final static String PROPERTY_PATH = "argeo.slc.jcr.path";
index 8b41fce41882f43ce9bba05eb12ec5cb7fe55219..6353804df36e7cd15e56976f50f8fa4e311c0bd9 100644 (file)
@@ -23,6 +23,8 @@ import javax.jcr.nodetype.NodeType;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.NodeUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 
 /**
  * Utilities around the SLC JCR Result model. Note that it relies on fixed base
index 02c1776ea5b56e8d2fe36a6ef47775a6da630018..137e298be3d96424ae5b9aae9da7cd81740a4f39 100644 (file)
@@ -31,6 +31,8 @@ import org.argeo.node.NodeUtils;
 import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
 import org.argeo.slc.core.execution.PrimitiveUtils;
 import org.argeo.slc.deploy.ModuleDescriptor;
diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcNames.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcNames.java
deleted file mode 100644 (file)
index 15213fc..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.jcr;
-
-/** JCR names used by SLC */
-public interface SlcNames {
-       public final static String SLC_ = "slc:";
-
-       /*
-        * GENERAL
-        */
-       public final static String SLC_UUID = "slc:uuid";
-       public final static String SLC_STATUS = "slc:status";
-       // generic name for result parts of a given test result (slc:testResult)
-       // note that corresponding nodes can be retrieved using
-       // myTestResultNode.getNodes(SLC_RESULT_PART+"*") method
-       public final static String SLC_RESULT_PART = "slc:resultPart";
-       // Fixed name of the child node of a slc:testResult of type
-       // slc:check that aggregate status of all result parts of a given test
-       // result
-       public final static String SLC_AGGREGATED_STATUS = "slc:aggregatedStatus";
-
-       public final static String SLC_TYPE = "slc:type";
-       public final static String SLC_NAME = "slc:name";
-       public final static String SLC_VERSION = "slc:version";
-       public final static String SLC_CATEGORY = "slc:category";
-       public final static String SLC_VALUE = "slc:value";
-       public final static String SLC_ADDRESS = "slc:address";
-       public final static String SLC_METADATA = "slc:metadata";
-
-       public final static String SLC_TIMESTAMP = "slc:timestamp";
-       public final static String SLC_STARTED = "slc:started";
-       public final static String SLC_COMPLETED = "slc:completed";
-
-       public final static String SLC_VM = "slc:vm";
-       /*
-        * SLC RUNTIME
-        */
-       // execution
-       public final static String SLC_SPEC = "slc:spec";
-       public final static String SLC_EXECUTION_SPECS = "slc:executionSpecs";
-       public final static String SLC_FLOW = "slc:flow";
-       public final static String SLC_LOG = "slc:log";
-       public final static String SLC_AGENTS = "slc:agents";
-
-       // spec attribute
-       public final static String SLC_IS_IMMUTABLE = "slc:isImmutable";
-       public final static String SLC_IS_CONSTANT = "slc:isConstant";
-       public final static String SLC_IS_HIDDEN = "slc:isHidden";
-
-       // base directories
-       public final static String SLC_SYSTEM = "slc:system";
-       public final static String SLC_RESULTS = "slc:results";
-       public final static String SLC_MY_RESULTS = "slc:myResults";
-       public final static String SLC_PROCESSES = "slc:processes";
-
-       // result
-       public final static String SLC_SUCCESS = "slc:success";
-       public final static String SLC_MESSAGE = "slc:message";
-       public final static String SLC_TAG = "slc:tag";
-       public final static String SLC_ERROR_MESSAGE = "slc:errorMessage";
-       public final static String SLC_TEST_CASE = "slc:testCase";
-       public final static String SLC_TEST_CASE_TYPE = "slc:testCaseType";
-
-       // diff result
-       public final static String SLC_SUMMARY = "slc:summary";
-       public final static String SLC_ISSUES = "slc:issues";
-
-       /*
-        * SLC REPO
-        */
-       // shared
-       public final static String SLC_URL = "slc:url";
-       public final static String SLC_OPTIONAL = "slc:optional";
-       public final static String SLC_AS_STRING = "slc:asString";
-
-       // origin
-       public final static String SLC_ORIGIN = "slc:origin";
-       public final static String SLC_PROXY = "slc:proxy";
-
-       // slc:artifact
-       public final static String SLC_ARTIFACT_ID = "slc:artifactId";
-       public final static String SLC_GROUP_ID = "slc:groupId";
-       public final static String SLC_GROUP_BASE_ID = "slc:groupBaseId";
-       public final static String SLC_ARTIFACT_VERSION = "slc:artifactVersion";
-       public final static String SLC_ARTIFACT_EXTENSION = "slc:artifactExtension";
-       public final static String SLC_ARTIFACT_CLASSIFIER = "slc:artifactClassifier";
-
-       // slc:jarArtifact
-       public final static String SLC_MANIFEST = "slc:manifest";
-
-       // shared OSGi
-       public final static String SLC_SYMBOLIC_NAME = "slc:symbolic-name";
-       public final static String SLC_BUNDLE_VERSION = "slc:bundle-version";
-
-       // slc:osgiBaseVersion
-       public final static String SLC_MAJOR = "slc:major";
-       public final static String SLC_MINOR = "slc:minor";
-       public final static String SLC_MICRO = "slc:micro";
-       // slc:osgiVersion
-       public final static String SLC_QUALIFIER = "slc:qualifier";
-
-       // slc:exportedPackage
-       public final static String SLC_USES = "slc:uses";
-
-       // slc:modularDistribution
-       public final static String SLC_MODULES = "slc:modules";
-
-       // RPM
-       // slc:rpm
-       public final static String SLC_RPM_VERSION = "slc:rpmVersion";
-       public final static String SLC_RPM_RELEASE = "slc:rpmRelease";
-       public final static String SLC_RPM_ARCH = "slc:rpmArch";
-       public final static String SLC_RPM_ARCHIVE_SIZE = "slc:rpmArchiveSize";
-}
diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcTypes.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcTypes.java
deleted file mode 100644 (file)
index 5cb6a13..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.slc.jcr;
-
-/** JCR node types used by SLC */
-public interface SlcTypes {
-
-       public final static String SLC_NAME_VERSION = "slc:nameVersion";
-       public final static String SLC_CATEGORIZED_NAME_VERSION = "slc:categorizedNameVersion";
-
-       public final static String SLC_AGENT_FACTORY = "slc:agentFactory";
-       public final static String SLC_AGENT = "slc:agent";
-       public final static String SLC_MODULE = "slc:module";
-       public final static String SLC_EXECUTION_MODULE = "slc:executionModule";
-       public final static String SLC_EXECUTION_SPEC = "slc:executionSpec";
-       public final static String SLC_EXECUTION_FLOW = "slc:executionFlow";
-       public final static String SLC_PROCESS = "slc:process";
-       public final static String SLC_REALIZED_FLOW = "slc:realizedFlow";
-
-       public final static String SLC_EXECUTION_SPEC_ATTRIBUTE = "slc:executionSpecAttribute";
-       public final static String SLC_PRIMITIVE_SPEC_ATTRIBUTE = "slc:primitiveSpecAttribute";
-       public final static String SLC_REF_SPEC_ATTRIBUTE = "slc:refSpecAttribute";
-
-       public final static String SLC_TEST_RESULT = "slc:testResult";
-       public final static String SLC_CHECK = "slc:check";
-       public final static String SLC_PROPERTY = "slc:property";
-       public final static String SLC_DIFF_RESULT = "slc:diffResult";
-
-       // Node types used for user defined and managed result UI tree
-       public final static String SLC_MY_RESULT_ROOT_FOLDER = "slc:myResultRootFolder";
-       public final static String SLC_RESULT_FOLDER = "slc:resultFolder";
-
-       // Log levels
-       public final static String SLC_LOG_ENTRY = "slc:logEntry";
-       public final static String SLC_LOG_TRACE = "slc:logTrace";
-       public final static String SLC_LOG_DEBUG = "slc:logDebug";
-       public final static String SLC_LOG_INFO = "slc:logInfo";
-       public final static String SLC_LOG_WARNING = "slc:logWarning";
-       public final static String SLC_LOG_ERROR = "slc:logError";
-
-       /*
-        * REPO
-        */
-       public final static String SLC_ARTIFACT = "slc:artifact";
-       public final static String SLC_ARTIFACT_VERSION_BASE = "slc:artifactVersion";
-       public final static String SLC_ARTIFACT_BASE = "slc:artifactBase";
-       public final static String SLC_GROUP_BASE = "slc:groupBase";
-       public final static String SLC_JAR_FILE = "slc:jarFile";
-       public final static String SLC_BUNDLE_ARTIFACT = "slc:bundleArtifact";
-       public final static String SLC_OSGI_VERSION = "slc:osgiVersion";
-       public final static String SLC_JAVA_PACKAGE = "slc:javaPackage";
-       public final static String SLC_EXPORTED_PACKAGE = "slc:exportedPackage";
-       public final static String SLC_IMPORTED_PACKAGE = "slc:importedPackage";
-       public final static String SLC_DYNAMIC_IMPORTED_PACKAGE = "slc:dynamicImportedPackage";
-       public final static String SLC_REQUIRED_BUNDLE = "slc:requiredBundle";
-       public final static String SLC_FRAGMENT_HOST = "slc:fragmentHost";
-
-       // Distribution management
-       // public final static String SLC_CATEGORY = "slc:category";
-       public final static String SLC_MODULAR_DISTRIBUTION_BASE = "slc:modularDistributionBase";
-       public final static String SLC_MODULAR_DISTRIBUTION = "slc:modularDistribution";
-       public final static String SLC_MODULE_COORDINATES = "slc:moduleCoordinates";
-
-       // origin
-       public final static String SLC_KNOWN_ORIGIN = "slc:knownOrigin";
-       public final static String SLC_PROXIED = "slc:proxied";
-
-       // rpm
-       public final static String SLC_RPM = "slc:rpm";
-}
index 3f49549303d8150d9071220ceab45c743dafc16b..89b4530ac2fa4120fe0cd118de7f877d8e102a68 100644 (file)
@@ -28,13 +28,13 @@ import javax.jcr.security.Privilege;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcConstants;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.core.execution.DefaultAgent;
 import org.argeo.slc.core.execution.ProcessThread;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.jcr.SlcJcrConstants;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 
 /** SLC VM agent synchronizing with a JCR repository. */
 public class JcrAgent extends DefaultAgent implements SlcNames {
index ea734a8bbd6da7eed8c427b5321b7e74af6e5832..1a2576e069baf0bb8e1d7cd1e6656c2d61e73048 100644 (file)
@@ -31,6 +31,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
 import org.argeo.slc.core.execution.PrimitiveValue;
 import org.argeo.slc.core.execution.RefSpecAttribute;
@@ -43,8 +45,6 @@ import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.jcr.SlcJcrUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 
 /**
  * Synchronizes the local execution runtime with a JCR repository. For the time
index 180d8f008f84bc7e7d8644896b4486ade72c7fcb..e1ad69e3b75bae52727d29240e5e909817e2dac2 100644 (file)
@@ -31,13 +31,13 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.core.execution.ProcessThread;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.execution.ExecutionStep;
 import org.argeo.slc.execution.RealizedFlow;
 import org.argeo.slc.jcr.SlcJcrUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 
 /** Execution process implementation based on a JCR node. */
 public class JcrExecutionProcess implements ExecutionProcess, SlcNames {
index 9daeb4033cb0ca39fb9dfa91ce1099d862126434..a73e1a94ae97cb7494b6ad88c7d012892853803c 100644 (file)
@@ -24,11 +24,11 @@ import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
 import org.argeo.slc.core.execution.ProcessThread;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.execution.RealizedFlow;
-import org.argeo.slc.jcr.SlcNames;
 
 /** Where the actual execution takes place */
 public class JcrProcessThread extends ProcessThread implements SlcNames {
index 2dd56e3313c90dcd05a3e351915ca0a7db8d5810..c371b1114531c7544423a6f8849fdbea9f0ef60b 100644 (file)
@@ -9,6 +9,8 @@ import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.core.execution.DefaultExecutionSpec;
 import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
 import org.argeo.slc.core.execution.PrimitiveUtils;
@@ -17,8 +19,6 @@ import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.execution.RealizedFlow;
 import org.argeo.slc.jcr.SlcJcrUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 
 public class JcrRealizedFlow extends RealizedFlow implements SlcNames {
        private static final long serialVersionUID = -3709453850260712001L;
diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/slc.cnd b/org.argeo.slc.core/src/org/argeo/slc/jcr/slc.cnd
deleted file mode 100644 (file)
index 6e23cf5..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-<slc = 'http://www.argeo.org/ns/slc'>
-
-// COMMON
-[slc:nameVersion] > nt:base
-mixin
-- slc:name (STRING) m
-- slc:version (STRING) m
-
-[slc:categorizedNameVersion] > slc:nameVersion
-mixin
-// define as mandatory?
-- slc:category (STRING)
-
-// AGENT
-[slc:agentFactory] > nt:unstructured, mix:title
-+ * (slc:agent)
-
-[slc:agent] > nt:unstructured, mix:title
-+ * (slc:module)
-
-[slc:module] > slc:nameVersion, mix:title
-mixin
-
-[slc:activableModule] > slc:module
-mixin
-
-[slc:executionModule] > slc:activableModule
-mixin
-
-[slc:executionSpec] > nt:unstructured, mix:referenceable, mix:title
-- slc:name (STRING) m
-+ * (slc:executionSpecAttribute) *
-
-[slc:executionSpecAttribute] > nt:base
-mixin abstract
-- slc:isImmutable (BOOLEAN) 
-- slc:isConstant (BOOLEAN) 
-- slc:isHidden (BOOLEAN) 
-
-[slc:primitiveSpecAttribute] > slc:executionSpecAttribute
-mixin
-- slc:type (STRING) 
-- slc:value (UNDEFINED)
-
-[slc:refSpecAttribute] > slc:executionSpecAttribute
-orderable
-mixin
-// typically a class name
-- slc:type (STRING)
-- slc:value (UNDEFINED)
-+ * (mix:title)
-
-[slc:executionFlow] > nt:unstructured, mix:title
-- slc:name (STRING) ! m
-// if the execution spec is a referenceable node
-- slc:spec (REFERENCE)
-// if the execution spec is internal (without name)
-+ * (slc:executionSpecAttribute) *
-
-// PROCESS
-[slc:process] > nt:unstructured, mix:created, mix:lastModified
-orderable
-- slc:uuid (STRING) ! m
-- slc:status (STRING) m
-+ slc:flow (slc:realizedFlow)
-+ slc:log
-
-// The first part of the relative path is the thread name, rest is location
-[slc:logEntry] > nt:unstructured
-abstract
-- slc:message (STRING) !
-- slc:timestamp (STRING)
-
-// Log levels are set via types.
-// Querying one level also queries the higher levels thanks to the inheritance
-// e.g. 'select * from [slc:logWarn]' also returns errors 
-[slc:logTrace] > slc:logEntry
-
-[slc:logDebug] > slc:logTrace
-
-[slc:logInfo] > slc:logDebug
-
-[slc:logWarning] > slc:logInfo
-
-[slc:logError] > slc:logWarning
-
-[slc:realizedFlow] > nt:base
-orderable
-mixin
-// the name of the flow
-// - slc:flow (STRING)
-// the name of the execution spec
-// - slc:spec (STRING)
-- slc:started (DATE)
-- slc:completed (DATE)
-//- slc:status (STRING)
-+ slc:address (nt:address)
-+ slc:flow (slc:realizedFlow) *
-// the realized execution spec attributes
-+ * (slc:executionSpecAttribute) *
-
-// RESULT
-[slc:testResult] > nt:unstructured, mix:created, mix:lastModified
-- slc:uuid (STRING) ! m
-- slc:testCase (STRING)
-- slc:completed (DATE)
-// Helper to keep a centralize place to have testResultStatus
-// when adding more than one result part to a given testResult 
-+ slc:aggregatedStatus (slc:check)
-// DEPRECATED - FOR COMPATIBILITY - DO NOT USE
-+ slc:testStatus (slc:check)
-
-[slc:diffResult] > slc:testResult
-+ slc:summary
-+ slc:issues
-
-[slc:resultFolder] > nt:unstructured
-+ slc:folderStatus (slc:check)
-+ * (slc:resultFolder) *
-+ * (slc:testResult) *
-
-// base node for user defined and managed result tree
-// simplify UI management
-[slc:myResultRootFolder] > nt:unstructured
-+ * (slc:resultFolder) *
-+ * (slc:testResult) *
-
-[slc:check] > nt:unstructured
-// true for PASSED, false for FAILED or ERROR
-- slc:success (BOOLEAN) ! m
-- slc:message (STRING)
-// ERROR if set, the check could not be performed because of an unexpected exception
-- slc:errorMessage (STRING)
-// to ease transition with legacy approach
-+ * (slc:property) *
-
-[slc:property] > nt:unstructured
-- slc:name (STRING) ! m
-- slc:value (STRING) m
index 23e70cd7186082aec990e60150d53850d0b9e473..7f7eb120284d32d1583c9cae05f480645f0ad0fd 100644 (file)
@@ -32,8 +32,8 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.proxy.AbstractUrlProxy;
 import org.argeo.slc.SlcConstants;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.rpmfactory.RpmProxyService;
 import org.argeo.slc.rpmfactory.RpmRepository;
index 98b61ed274d218ef6836270e3358e5089a8d5fbf..d40b307f8a30523d05313598606bf7c7dbfae99d 100644 (file)
@@ -7,7 +7,7 @@ javax.jcr.nodetype,\
 
 Require-Capability: cms.datamodel; filter:="(name=node)",\
 cms.datamodel; filter:="(name=slc)"
-Provide-Capability: cms.datamodel; name=java; cnd=/org/argeo/slc/repo/repo.cnd,\
- cms.datamodel; name=dist; cnd=/org/argeo/slc/repo/repo.cnd,\
- cms.datamodel; name=docs; cnd=/org/argeo/slc/repo/repo.cnd,\
- cms.datamodel; name=rpm; cnd=/org/argeo/slc/repo/repo.cnd
+Provide-Capability: cms.datamodel; name=java,\
+ cms.datamodel; name=dist,\
+ cms.datamodel; name=docs,\
+ cms.datamodel; name=rpm
index be4075119572e1c69462f3e78919ebf1b82a7ca4..214269c5fb68267332aa17e9c0c7854f125de238 100644 (file)
@@ -25,8 +25,8 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.AetherUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.eclipse.aether.artifact.Artifact;
 import org.osgi.framework.Constants;
 
index b07cade3367474c79e311e723687cc122d5a8821..89f7120e407b4beca0a670f94db27a8572a4a517 100644 (file)
@@ -43,8 +43,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Version;
 
index 0b2ecfb775700d97f221273715ba0b69069f60d7..594168d511ea4042dc2c0c18dd8bfe03108e3a45 100644 (file)
@@ -26,8 +26,8 @@ import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.AetherUtils;
 import org.argeo.slc.build.Distribution;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.osgi.framework.Constants;
index cf144dcd750908b42f5b2b714721ad82ab999d70..056d7164c3277229232c8fd2d88193a6ad140a2b 100644 (file)
@@ -61,8 +61,8 @@ import org.argeo.slc.DefaultNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.ArtifactIdComparator;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
index f3675de71d68ae37498e2941a46130d89ff39518..fadac82adba13122a7037bdbad16d5171949c56e 100644 (file)
@@ -13,8 +13,8 @@ import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.io.FilenameUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.redline_rpm.ChannelWrapper.Key;
 import org.redline_rpm.ReadableChannelWrapper;
 import org.redline_rpm.header.AbstractHeader;
index bfba8d01c6fb3d778fe28de38dc30028051255cd..063b408c74b4894b2b58e44e31b9bc6f3d4768e3 100644 (file)
@@ -34,8 +34,8 @@ import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.ArtifactIdComparator;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
index 63e7d874c136d0854052bfe2b90b3a0f84d84e20..9f97dff50d47a6ecb58faad8e5dd7e042b769b0e 100644 (file)
@@ -28,8 +28,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.RepoConstants;
 import org.eclipse.aether.artifact.Artifact;
 
index 2b3dc9c2e234ec09f243ed53898619aca252dfd3..789f4c215eeb10a4cc755553ea48156a5fcc9a17 100644 (file)
@@ -33,8 +33,8 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.proxy.AbstractUrlProxy;
 import org.argeo.slc.SlcConstants;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.MavenProxyService;
 import org.argeo.slc.repo.RepoConstants;
 import org.eclipse.aether.repository.RemoteRepository;
index 1be5a808614294f14163fa9b5074d8fee4fd8ced..065e22ef64378e839201b0be4be4678615d84b49 100644 (file)
@@ -43,8 +43,8 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.JarFileIndexer;
 import org.argeo.slc.repo.RepoUtils;
index c7a3bcd533714360ce2b7e6cd583476ec562cb45..82657b29fcd0f764a84a1907e1be696c33105ab6 100644 (file)
@@ -36,8 +36,8 @@ import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.ArtifactIdComparator;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
index 9ff5b81c42925b87f29eaa08f981118beec40119..e372afdfea0a5d5b3409024e8c71500cb4b70e0f 100644 (file)
@@ -24,8 +24,8 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcConstants;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.NodeIndexer;
 import org.argeo.slc.repo.OsgiFactory;
 import org.argeo.slc.repo.RepoConstants;
index d22e575e6d8a8b6efc8f1e467551693c9ea8a738..dacffbbee443826153ffb9fe1787678f0835be2d 100644 (file)
@@ -1,5 +1,4 @@
-<argeo = 'http://www.argeo.org/ns/argeo'>
-<slc = 'http://www.argeo.org/ns/slc'>
+<repo = 'http://www.argeo.org/ns/repo'>
 
 // Argeo Commons 1 node types
 [argeo:references] > nt:unstructured