From: Mathieu Baudier Date: Mon, 13 Nov 2017 11:56:09 +0000 (+0100) Subject: Merge repo.cnd into slc.cnd. X-Git-Tag: argeo-slc-2.1.10~12 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f59056d0b805cb91f524671a28b8780338509ba4;p=gpl%2Fargeo-slc.git Merge repo.cnd into slc.cnd. Move SLC names and types to API. (API breaking change) --- diff --git a/org.argeo.slc.api/bnd.bnd b/org.argeo.slc.api/bnd.bnd index e69de29bb..1d83c61cb 100644 --- a/org.argeo.slc.api/bnd.bnd +++ b/org.argeo.slc.api/bnd.bnd @@ -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 index 000000000..7e3205919 --- /dev/null +++ b/org.argeo.slc.api/src/org/argeo/slc/SlcNames.java @@ -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 index 000000000..d807aad8f --- /dev/null +++ b/org.argeo.slc.api/src/org/argeo/slc/SlcTypes.java @@ -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 index 000000000..ed4a16091 --- /dev/null +++ b/org.argeo.slc.api/src/org/argeo/slc/slc.cnd @@ -0,0 +1,294 @@ + + +// 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) + diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistConstants.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistConstants.java index 589f660cd..bcbceddbf 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistConstants.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/DistConstants.java @@ -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. */ diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java index 61a7c9b7f..18c0473ec 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java index c55efb65d..ab4f33303 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java index da1af5854..de82a3e2f 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java index 918778249..6abbb32fd 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenModuleEditor.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java index 1adb2a345..2dbd3377d 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java index 21cb95ca0..1b9022fd7 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java index 728407f66..7e0b49115 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactLabelProvider.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java index ac3459e95..d301bee28 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/ArtifactsTreeContentProvider.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java index 1db366126..4ae23b1ed 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ArtifactVersionEditor.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java index 60d17c5a8..3fd0fecdf 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDependencyPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java index c73e16eb3..466358bc0 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java index 5001886f3..c201f4e3b 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleRawPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java index a9cfe3822..2919841bb 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java index f23181367..d4b322d45 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspEditorInput.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java index 3b8b49bce..caba3c941 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java index 06e892f02..5e9afae81 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java index 396950498..e2b8e7940 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionDetailPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java index c870baf1c..0bd922fa2 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java index bcb0b2a22..eddfdd02c 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModuleEditorInput.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java index 9259971de..04f706e98 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/RunInOsgiPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java index ade3c2d73..e92db49dc 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/WkspCategoryBaseListPage.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java index 1040e2c4e..4ee0b59f3 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/ModularDistVersionBaseElem.java @@ -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 diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java index 40409dc84..4c78511bc 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java @@ -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 { diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java index a8a321cf4..a35794222 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java index 2820d9294..5a5e4b331 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java @@ -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); diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java index ceff72d10..2a8ff798e 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java index 76967be6a..b4100cdd7 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java @@ -16,12 +16,12 @@ 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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java index 6f6171436..323159d43 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java index 217ab493c..1c52cf775 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/DistributionsView.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java index 1db52456d..791fbc70a 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java index b48018cce..35333e4d2 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsText.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java index ee5fbdb64..baeeddc2c 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java @@ -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; diff --git a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java index 5df19d628..5b4ea21c2 100644 --- a/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java +++ b/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/ClientUiPlugin.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/ClientUiPlugin.java index 936965f7b..05e57e9f1 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/ClientUiPlugin.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/ClientUiPlugin.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java index 7843dc2ba..4def5f4e0 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java @@ -26,9 +26,9 @@ import org.apache.commons.logging.LogFactory; 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.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java index f5a7c98d1..95e728e82 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java index a38a87f5c..758d761c6 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java index b2cb8200a..1e9788e39 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessLogPage.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessLogPage.java index 0fb27e95e..bca80f54a 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessLogPage.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessLogPage.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java index 51ffb1118..b3f6d7dc7 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java @@ -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 diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultFolder.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultFolder.java index c564492d8..57fc627ac 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultFolder.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultFolder.java @@ -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 diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparator.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparator.java index 30e7baa44..74ec9ec73 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparator.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultItemsComparator.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParentUtils.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParentUtils.java index 2d93b2619..268d746c1 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParentUtils.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ResultParentUtils.java @@ -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 = diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/SingleResultNode.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/SingleResultNode.java index afd124989..d95e0f46a 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/SingleResultNode.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/SingleResultNode.java @@ -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 diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/VirtualFolder.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/VirtualFolder.java index 1218060eb..d6b7a3b5d 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/VirtualFolder.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/VirtualFolder.java @@ -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 diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java index 697433fe7..b92a125d3 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java index 8ab5c8f6f..18f8a5aee 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultListView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultListView.java index 7ff0e2002..2843c26cd 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultListView.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultListView.java @@ -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; diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java index a7d63413d..ecf7adeb9 100644 --- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java +++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java @@ -37,6 +37,8 @@ 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.ClientUiPlugin; import org.argeo.slc.client.ui.SlcUiConstants; import org.argeo.slc.client.ui.commands.AddResultFolder; @@ -57,8 +59,6 @@ import org.argeo.slc.client.ui.model.VirtualFolder; import org.argeo.slc.client.ui.providers.ResultTreeContentProvider; import org.argeo.slc.client.ui.providers.ResultTreeLabelProvider; import org.argeo.slc.jcr.SlcJcrResultUtils; -import org.argeo.slc.jcr.SlcNames; -import org.argeo.slc.jcr.SlcTypes; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; diff --git a/org.argeo.slc.core/bnd.bnd b/org.argeo.slc.core/bnd.bnd index ffbb76507..5b3c49ffa 100644 --- a/org.argeo.slc.core/bnd.bnd +++ b/org.argeo.slc.core/bnd.bnd @@ -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 diff --git a/org.argeo.slc.core/src/org/argeo/slc/core/execution/http/RunnerServlet.java b/org.argeo.slc.core/src/org/argeo/slc/core/execution/http/RunnerServlet.java index 4147bad17..c467e0013 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/core/execution/http/RunnerServlet.java +++ b/org.argeo.slc.core/src/org/argeo/slc/core/execution/http/RunnerServlet.java @@ -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; diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/JcrMetadataWriter.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/JcrMetadataWriter.java index 19db9cbf7..c4922d325 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/JcrMetadataWriter.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/JcrMetadataWriter.java @@ -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 diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/JcrTestResult.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/JcrTestResult.java index e3394e05c..c9ec874ea 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/JcrTestResult.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/JcrTestResult.java @@ -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; diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrConstants.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrConstants.java index 179a081f4..3190c85b9 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrConstants.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrConstants.java @@ -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"; diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java index 8b41fce41..6353804df 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrResultUtils.java @@ -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 diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java index 02c1776ea..137e298be 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcJcrUtils.java @@ -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 index 15213fc0a..000000000 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcNames.java +++ /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 index 5cb6a1361..000000000 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/SlcTypes.java +++ /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"; -} diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrAgent.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrAgent.java index 3f4954930..89b4530ac 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrAgent.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrAgent.java @@ -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 { diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java index ea734a8bb..1a2576e06 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java @@ -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 diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java index 180d8f008..e1ad69e3b 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java @@ -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 { diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java index 9daeb4033..a73e1a94a 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrProcessThread.java @@ -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 { diff --git a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java index 2dd56e331..c371b1114 100644 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java +++ b/org.argeo.slc.core/src/org/argeo/slc/jcr/execution/JcrRealizedFlow.java @@ -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 index 6e23cf5e9..000000000 --- a/org.argeo.slc.core/src/org/argeo/slc/jcr/slc.cnd +++ /dev/null @@ -1,139 +0,0 @@ - - -// 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 diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java index 23e70cd71..7f7eb1202 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java @@ -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; diff --git a/org.argeo.slc.repo/bnd.bnd b/org.argeo.slc.repo/bnd.bnd index 98b61ed27..d40b307f8 100644 --- a/org.argeo.slc.repo/bnd.bnd +++ b/org.argeo.slc.repo/bnd.bnd @@ -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 diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java index be4075119..214269c5f 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java index b07cade33..89f7120e4 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java index 0b2ecfb77..594168d51 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java index cf144dcd7..056d7164c 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java index f3675de71..fadac82ad 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RpmIndexer.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java index bfba8d01c..063b408c7 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java index 63e7d874c..9f97dff50 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java index 2b3dc9c2e..789f4c215 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java index 1be5a8086..065e22ef6 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java index c7a3bcd53..82657b29f 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java @@ -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; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java index 9ff5b81c4..e372afdfe 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java @@ -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; 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 index d22e575e6..dacffbbee 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/repo.cnd +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/repo.cnd @@ -1,5 +1,4 @@ - - + // Argeo Commons 1 node types [argeo:references] > nt:unstructured