ENTAXY-374 fix file connection

ENTAXY-374 release 1.8.2
2022-09-09 11:49:41 +03:00 · 2022-08-25 16:12:26 +03:00
8 changed files with 389 additions and 5 deletions
--- a/platform/runtime/core/initializer/connection-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/connection/ConnectionInitializer.java
+++ b/platform/runtime/core/initializer/connection-initializer/src/main/java/ru/entaxy/esb/platform/runtime/core/initializer/connection/ConnectionInitializer.java
@ -204,7 +204,8 @@ public class ConnectionInitializer extends AbstractInitializer {
 	        	.command("build")
 					.set(EntaxyProducerService.INSTRUCTIONS.ARTIFACT.TIMESTAMP, newTimestamp)
 	        	.command("install")
-	        		.set("update", "");
+	        		.set("update", "")
+	        		.set("installLocal", true);

 	        	String instructions = builder
 	        			.getInstructionsString();
--- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Build.java
+++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Build.java
@ -21,6 +21,7 @@ package ru.entaxy.platform.core.producer.executor.commands;

 import java.util.Map;

+import org.osgi.framework.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@ -137,6 +138,13 @@ public class Build extends AbstractCommandExecutor {
 				}
 			}
 			artifact.getProperties().putAll(g.getProperties());
+			// TODO get value from manifest
+			// ArtifactManifest must be improved to provide read access to all attributes
+			if (!artifact.getProperties().containsKey(Constants.BUNDLE_SYMBOLICNAME)) {
+				artifact.getProperties().put(Constants.BUNDLE_SYMBOLICNAME
+						, artifact.getCoordinates().getGroupId() 
+							+ "." + artifact.getCoordinates().getArtifactId());
+			}
 			artifactList.add(artifact);
 			printOutput("\n\t == " + artifact.getCoordinates().toString() + " ==\n");
 			printOutput(new String(artifact.asByteArray()));
--- a/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Install.java
+++ b/platform/runtime/core/object-producing/object-producer-core/src/main/java/ru/entaxy/platform/core/producer/executor/commands/Install.java
@ -90,6 +90,8 @@ public class Install extends AbstractCommandExecutor {
 			
 			Installer<?> installer = null;
 			
+			String artifactUpdate = update;
+			
 			printOutput("-> Installing artifact: [" + da.getArtifact().getCoordinates().toString() + "]");
 			if (installLocal) {
 				LocalInstaller localInstaller =  artifactService.installers().local()
@ -110,14 +112,14 @@ public class Install extends AbstractCommandExecutor {
 				BlueprintInstaller blueprintInstaller = installer.typed(BlueprintInstaller.class);
 				if (installOnlyIfMissing)
 					blueprintInstaller.installOnlyIfMissing();
-				if (update != null) {
-					if (!CommonUtils.isValid(update)) {
-						update = da
+				if (artifactUpdate != null) {
+					if (!CommonUtils.isValid(artifactUpdate)) {
+						artifactUpdate = da
 	        					.getArtifact().getProperties()
 	        					.getOrDefault(Constants.BUNDLE_SYMBOLICNAME, "")
 	        					.toString();
 					}
-					blueprintInstaller.update(update);
+					blueprintInstaller.update(artifactUpdate);
 				}
 				result = blueprintInstaller.start().install();
 			} else {
--- a/underlying/artemis.entaxy/pom.xml
+++ b/underlying/artemis.entaxy/pom.xml
@ -1437,6 +1437,21 @@
                </plugins>
            </build>
        </profile>
+        <profile>
+            <id>public-deploy</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <distributionManagement>
+                <repository>
+                    <id>entaxy-public-entaxy</id>
+                    <name>entaxy-public-entaxy</name>
+                    <uniqueVersion>false</uniqueVersion>
+                    <layout>default</layout>
+                    <url>https://nexus.entaxy.ru/nexus/repository/entaxy-public-entaxy/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
    </profiles>

    <build>
@ -1906,4 +1921,68 @@
       </repository>
    </repositories> -->

+	<repositories>
+
+		<!--
+			contains all used components together with sources and javadocs, proxies Maven Central and Apache
+			also contains public Entaxy releases & snapshots (snapshots are disabled here)
+		-->
+		<repository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+		<!--
+			contains all Entaxy snaphots and releases, authorized access only
+			use Maven settins.xml to provide access credentials
+		-->
+		<repository>
+			<id>entaxy-private</id>
+			<name>entaxy-private</name>
+			<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
 </project>
--- a/underlying/camel.entaxy/pom.xml
+++ b/underlying/camel.entaxy/pom.xml
@ -82,6 +82,7 @@
    </properties>

    <!-- Comment out the snapshot repositories as we don't need them now -->
+	<!-- 
    <repositories>
        <repository>
            <id>central</id>
@ -94,7 +95,9 @@
                <enabled>true</enabled>
            </releases>
        </repository>
+		-->
        <!-- camel-jira -->
+		<!-- 
        <repository>
            <id>atlassian-public</id>
            <url>https://packages.atlassian.com/maven-external</url>
@ -106,7 +109,9 @@
                <enabled>true</enabled>
            </releases>
        </repository>
+		-->
        <!-- camel-ipfs and camel-weka -->
+		<!-- 
        <repository>
            <id>jboss.thirdparty</id>
            <name>JBoss Thirdparty Repository</name>
@ -142,6 +147,7 @@
            </releases>
        </pluginRepository>
    </pluginRepositories>
+	 -->

    <build>
        <defaultGoal>install</defaultGoal>
@ -876,4 +882,69 @@
        </profile>

    </profiles>
+
+	<repositories>
+
+		<!--
+			contains all used components together with sources and javadocs, proxies Maven Central and Apache
+			also contains public Entaxy releases & snapshots (snapshots are disabled here)
+		-->
+		<repository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+		<!--
+			contains all Entaxy snaphots and releases, authorized access only
+			use Maven settins.xml to provide access credentials
+		-->
+		<repository>
+			<id>entaxy-private</id>
+			<name>entaxy-private</name>
+			<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
 </project>
--- a/underlying/cellar.entaxy/pom.xml
+++ b/underlying/cellar.entaxy/pom.xml
@ -745,4 +745,68 @@
        </profile>
    </profiles>

+	<repositories>
+
+		<!--
+			contains all used components together with sources and javadocs, proxies Maven Central and Apache
+			also contains public Entaxy releases & snapshots (snapshots are disabled here)
+		-->
+		<repository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+		<!--
+			contains all Entaxy snaphots and releases, authorized access only
+			use Maven settins.xml to provide access credentials
+		-->
+		<repository>
+			<id>entaxy-private</id>
+			<name>entaxy-private</name>
+			<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
 </project>
--- a/underlying/org.apache.aries.blueprint.cm-1.3.2.entaxy/pom.xml
+++ b/underlying/org.apache.aries.blueprint.cm-1.3.2.entaxy/pom.xml
@ -78,6 +78,21 @@
                <blueprint.sample.fragment.version>${blueprint.sample.fragment.dev.version}</blueprint.sample.fragment.version>
            </properties>
        </profile>
+        <profile>
+            <id>public-deploy</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <distributionManagement>
+                <repository>
+                    <id>entaxy-public-entaxy</id>
+                    <name>entaxy-public-entaxy</name>
+                    <uniqueVersion>false</uniqueVersion>
+                    <layout>default</layout>
+                    <url>https://nexus.entaxy.ru/nexus/repository/entaxy-public-entaxy/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
    </profiles>

    <dependencies>
@ -185,4 +200,68 @@
        </plugins>
    </build>

+	<repositories>
+
+		<!--
+			contains all used components together with sources and javadocs, proxies Maven Central and Apache
+			also contains public Entaxy releases & snapshots (snapshots are disabled here)
+		-->
+		<repository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+		<!--
+			contains all Entaxy snaphots and releases, authorized access only
+			use Maven settins.xml to provide access credentials
+		-->
+		<repository>
+			<id>entaxy-private</id>
+			<name>entaxy-private</name>
+			<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
 </project>
--- a/underlying/org.apache.felix.configadmin-1.9.16.entaxy/pom.xml
+++ b/underlying/org.apache.felix.configadmin-1.9.16.entaxy/pom.xml
@ -312,5 +312,85 @@
                </plugins>
            </build>
        </profile>
+        <profile>
+            <id>public-deploy</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <distributionManagement>
+                <repository>
+                    <id>entaxy-public-entaxy</id>
+                    <name>entaxy-public-entaxy</name>
+                    <uniqueVersion>false</uniqueVersion>
+                    <layout>default</layout>
+                    <url>https://nexus.entaxy.ru/nexus/repository/entaxy-public-entaxy/</url>
+                </repository>
+            </distributionManagement>
+        </profile>
    </profiles>
+
+	<repositories>
+
+		<!--
+			contains all used components together with sources and javadocs, proxies Maven Central and Apache
+			also contains public Entaxy releases & snapshots (snapshots are disabled here)
+		-->
+		<repository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+
+		<!--
+			contains all Entaxy snaphots and releases, authorized access only
+			use Maven settins.xml to provide access credentials
+		-->
+		<repository>
+			<id>entaxy-private</id>
+			<name>entaxy-private</name>
+			<!-- url>http://localhost:8981/repository/entaxy-private/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-private/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</snapshots>
+		</repository>
+
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>entaxy-public</id>
+			<name>entaxy-public</name>
+			<!-- url>http://localhost:8981/repository/entaxy-public/</url -->
+			<url>https://nexus.entaxy.ru/nexus/repository/entaxy-public/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<checksumPolicy>warn</checksumPolicy>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
 </project>
Author	SHA1	Message	Date
Sergey Kryuchkov	a0d3fb9633	ENTAXY-374 fix file connection	2022-09-09 11:49:41 +03:00
Sergey Kryuchkov	f495628c75	ENTAXY-374 release 1.8.2	2022-08-25 16:12:26 +03:00