entaxy/entaxy-public
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ENTAXY-374 release 1.8.2

Browse Source
This commit is contained in:
Сергей Крючков
2022-08-23 13:40:11 +03:00
parent b68642f81c
commit f495628c75
618 changed files with 61269 additions and 3202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/auth/basic-auth/basic-auth-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>
<artifactId>basic-auth</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth.basic.api</groupId>

2
system/auth/basic-auth/basic-auth-impl/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>
<artifactId>basic-auth</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth.basic.impl</groupId>

12
system/auth/basic-auth/basic-auth-impl/src/main/java/ru/entaxy/esb/system/auth/basic/jpa/impl/BasicAuthServiceImpl.java
View File

@ -44,7 +44,7 @@ public class BasicAuthServiceImpl implements BasicAuthService {
private static final Logger LOG = LoggerFactory.getLogger(BasicAuthServiceImpl.class);
private SessionFactory sessionFactory;
private String еncryptionAlgorithm;
private String encryptionAlgorithm;
private String encryptionSalt;
private PermissionService permissionService;
@ -56,8 +56,8 @@ public class BasicAuthServiceImpl implements BasicAuthService {
return sessionFactory.openSession();
}
public void setЕncryptionAlgorithm(String еncryptionAlgorithm) {
this.еncryptionAlgorithm = еncryptionAlgorithm;
public void setEncryptionAlgorithm(String encryptionAlgorithm) {
this.encryptionAlgorithm = encryptionAlgorithm;
}
public void setEncryptionSalt(String encryptionSalt) {
@ -208,11 +208,11 @@ public class BasicAuthServiceImpl implements BasicAuthService {
public BasicAuthAccount saveCommon(String login, String passwordHash, String systemUUID, String createdBy, String editedBy)
throws NoSuchAlgorithmException, BadPasswordException {
if (null != passwordHash && !passwordHash.isEmpty()) {
passwordHash = EncryptionHelper.encrypt(passwordHash, this.еncryptionAlgorithm, this.encryptionSalt);
passwordHash = EncryptionHelper.encrypt(passwordHash, this.encryptionAlgorithm, this.encryptionSalt);
} else {
throw new BadPasswordException("Password not passed or empty!");
}
return saveFull(login, passwordHash, this.еncryptionAlgorithm, systemUUID, "", "", createdBy, editedBy);
return saveFull(login, passwordHash, this.encryptionAlgorithm, systemUUID, "", "", createdBy, editedBy);
}
@Override
@ -253,7 +253,7 @@ public class BasicAuthServiceImpl implements BasicAuthService {
return true;
}
} catch (NoSuchAlgorithmException e) {
LOG.error("Encription algorithm error", e);
LOG.error("Encryption algorithm error", e);
}
}
}

10
system/auth/basic-auth/basic-auth-impl/src/main/resources/OSGI-INF/blueprint/camel-context.xml
View File

@ -26,8 +26,8 @@
<cm:property-placeholder persistent-id="ru.entaxy.esb.system.basic_auth" update-strategy="reload">
<cm:default-properties>
<cm:property name="еncryption.algorithm" value="SHA-1"/>
<cm:property name="еncryption.salt" value="kDfq0qZJ"/>
<cm:property name="encryption.algorithm" value="SHA-1"/>
<cm:property name="encryption.salt" value="kDfq0qZJ"/>
<cm:property name="internal.authentication.enabled" value="false"/>
</cm:default-properties>
</cm:property-placeholder>
@ -44,8 +44,8 @@
<service ref="basicAuthService" interface="ru.entaxy.esb.system.auth.basic.jpa.api.BasicAuthService"/>
<bean id="basicAuthService" class="ru.entaxy.esb.system.auth.basic.jpa.impl.BasicAuthServiceImpl">
<property name="sessionFactory" ref="sessionFactory"/>
<property name="еncryptionAlgorithm" value="${еncryption.algorithm}"/>
<property name="encryptionSalt" value="${еncryption.salt}"/>
<property name="encryptionAlgorithm" value="${encryption.algorithm}"/>
<property name="encryptionSalt" value="${encryption.salt}"/>
<property name="permissionService" ref="permissionService"/>
</bean>
@ -59,7 +59,7 @@
<bean id="basicAuthPostEventListener"
class="ru.entaxy.esb.system.auth.basic.jpa.listener.BasicAuthPostEventListener">
<property name="basicAuthService" ref="basicAuthService"/>
<property name="encryptionSalt" value="${еncryption.salt}"/>
<property name="encryptionSalt" value="${encryption.salt}"/>
<property name="htpasswdGenerator" ref="htpasswdGenerator"/>
</bean>
<bean id="baseAuthPostDeleteEventListener"

2
system/auth/basic-auth/basic-auth-soap/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>basic-auth</artifactId>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/auth/basic-auth/htpasswd/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>
<artifactId>basic-auth</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth.basic.htpasswd</groupId>

2
system/auth/basic-auth/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system.auth</groupId>
<artifactId>system-auth</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth.basic</groupId>

2
system/auth/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>system-parent</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.auth</groupId>

2
system/commons/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>system-parent</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.commons</groupId>

2
system/core/dispatcher/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core</groupId>
<artifactId>system-core</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>

2
system/core/error-handler/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core</groupId>
<artifactId>system-core</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
system/core/error-handler/src/main/java/ru/entaxy/esb/system/core/common/error/handler/interceptor/HandleOutFaultInterceptor.java
View File

@ -58,7 +58,7 @@ public class HandleOutFaultInterceptor extends AbstractSoapInterceptor {
public void handleMessage(SoapMessage message) {
LOG.debug("HandleOutFaultInterceptor.handleMessage invocation");
// String inMEssage = message.getExchange().getInMessage().getContent(String.class);
// String inMessage = message.getExchange().getInMessage().getContent(String.class);
// Fault fault = (Fault) message.getContent(Exception.class);
Map headers = prepareHeaders(message);
String response = template.requestBodyAndHeaders(this.endpointUri, "", headers, String.class);

2
system/core/events/events-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>

2
system/core/events/events-common/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>

2
system/core/events/events-handler/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>

4
system/core/events/events-handler/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View File

@ -34,7 +34,7 @@
<cm:property-placeholder
persistent-id="ru.entaxy.esb.system.event.handler" update-strategy="reload">
<cm:default-properties>
<cm:property name="quirtz.job.clean.cron" value="0+0/1+*+*+*+?+*"/><!-- cron - Every minute -->
<cm:property name="quartz.job.clean.cron" value="0+0/1+*+*+*+?+*"/><!-- cron - Every minute -->
<cm:property name="mode.dev" value="false"/>
</cm:default-properties>
</cm:property-placeholder>
@ -244,7 +244,7 @@
</route>
<route id="cleanTopicsJob">
<from uri="quartz://cleanTopics?cron={{quirtz.job.clean.cron}}"/>
<from uri="quartz://cleanTopics?cron={{quartz.job.clean.cron}}"/>
<log message="Job: Clean topics and subscriptions" loggingLevel="DEBUG"/>
<to uri="direct-vm:cleanProcess"/>
</route>

2
system/core/events/events-impl/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>

2
system/core/events/events-rest/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.events</groupId>
<artifactId>events</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../events/pom.xml</relativePath>
</parent>

2
system/core/events/events-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View File

@ -142,7 +142,7 @@
<choice>
<when>
<simple>${exchangeProperty.DELETED}</simple>
<!-- Restore ropic -->
<!-- Restore topic -->
<to uri="direct:restoreSubscriberRoutes"/>
<setHeader name="Exchange.HTTP_RESPONSE_CODE">
<constant>200</constant>

2
system/core/events/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core</groupId>
<artifactId>system-core</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>

2
system/core/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>system-parent</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.core</groupId>

2
system/core/security/permission-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.permission</groupId>
<artifactId>permission</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../security/pom.xml</relativePath>
</parent>

2
system/core/security/permission-common/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.permission</groupId>
<artifactId>permission</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../security/pom.xml</relativePath>
</parent>

2
system/core/security/permission-component/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.permission</groupId>
<artifactId>permission</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../security/pom.xml</relativePath>
</parent>

2
system/core/security/permission-handler/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.permission</groupId>
<artifactId>permission</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../security/pom.xml</relativePath>
</parent>

2
system/core/security/permission-impl/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.permission</groupId>
<artifactId>permission</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../security/pom.xml</relativePath>
</parent>

2
system/core/security/permission-soap/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core.permission</groupId>
<artifactId>permission</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<artifactId>permission-soap</artifactId>

2
system/core/security/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system.core</groupId>
<artifactId>system-core</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../core/pom.xml</relativePath>
</parent>

2
system/core/template/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>system-core</artifactId>
<groupId>ru.entaxy.esb.system.core</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb</groupId>
<artifactId>root</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system</groupId>

2
system/registry/connectors/connector-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.connector</groupId>
<artifactId>connectors</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/connectors/connector-impl/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.connector</groupId>
<artifactId>connectors</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/connectors/connector-impl/src/main/java/ru/entaxy/esb/system/connector/impl/ConnectorServiceImpl.java
View File

@ -128,7 +128,7 @@ public class ConnectorServiceImpl implements ConnectorService {
Connector connectorEntity = getConnector(system, connector.getTemplateName());
if (connectorEntity == null) {
connectorEntity = connector;
connectorEntity.setName(connector.getTemplateName() + "-" + system.getName());
connectorEntity.setName(connector.getTemplateName() + "." + system.getName());
connectorEntity.setSystemId(system.getId());
system.getConnectors().add(connectorEntity);
} else {

2
system/registry/connectors/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry</groupId>
<artifactId>registry</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../registry/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>system-parent</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<groupId>ru.entaxy.esb.system.registry</groupId>

2
system/registry/processes/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry</groupId>
<artifactId>registry</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../registry/pom.xml</relativePath>
</parent>

2
system/registry/profile-commons/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry</groupId>
<artifactId>registry</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../registry/pom.xml</relativePath>
</parent>

5
system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/Connector.java
View File

@ -26,6 +26,11 @@ import java.util.Map;
public interface Connector {
public static final String HEADERS_START = "NTX_Connector_";
public static final String ROLE = "role";
public static final String TYPE = "type";
public static final String SUBTYPE = "subtype";
String getEndpointName();
String getEndpointType();

3
system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/connectors/in/DirectVMInConnectorImpl.java
View File

@ -33,6 +33,9 @@ public class DirectVMInConnectorImpl extends CommonConnector implements InConnec
@Override
public void send(Exchange exchange) {
ProducerTemplate template = exchange.getContext().createProducerTemplate();
exchange.getIn().setHeader(HEADERS_START + ROLE, getParam(ROLE));
exchange.getIn().setHeader(HEADERS_START + TYPE, getParam(TYPE));
exchange.getIn().setHeader(HEADERS_START + SUBTYPE, getParam(SUBTYPE));
template.send("direct-vm:" + endpointName + "-" + endpointType + "-connector-" + systemName +
"?block=true&timeout=60000", exchange);
}

10
system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutput.java
View File

@ -25,12 +25,18 @@ import ru.entaxy.esb.system.profile.commons.connectors.out.OutConnector;
import java.util.List;
import static ru.entaxy.esb.system.profile.commons.connectors.Connector.*;
public interface ProfileOutput {
OutConnector getOutConnector(String systemName);
OutConnector getOutConnector(String endpointName, String role, String type, String subtype);
void send(Exchange exchange);
void sendTo(@Header("EndpointName") String endpointName, Exchange exchange);
void sendTo(@Header("EndpointName") String endpointName,
@Header(HEADERS_START + ROLE) String role,
@Header(HEADERS_START + TYPE) String type,
@Header(HEADERS_START + SUBTYPE) String subtype,
Exchange exchange);
public List<String> getReferenceNames();
}

26
system/registry/profile-commons/src/main/java/ru/entaxy/esb/system/profile/commons/profile_output/ProfileOutputImpl.java
View File

@ -31,6 +31,8 @@ import ru.entaxy.esb.system.common.exception.ConnectorNotFound;
import ru.entaxy.esb.system.common.osgi.impl.CommonNamedReferenceListener;
import ru.entaxy.esb.system.profile.commons.connectors.out.OutConnector;
import static ru.entaxy.esb.system.profile.commons.connectors.Connector.*;
public class ProfileOutputImpl extends CommonNamedReferenceListener<OutConnector> implements ProfileOutput {
private static final Logger log = LoggerFactory.getLogger(ProfileOutputImpl.class);
@ -42,8 +44,20 @@ public class ProfileOutputImpl extends CommonNamedReferenceListener<OutConnector
}
@Override
public OutConnector getOutConnector(String endpointName) {
if (endpointName == null || registeredReferences.get(endpointName) == null) {
public OutConnector getOutConnector(String endpointName, String role, String type, String subtype) {
for (OutConnector outConnector : registeredReferences.values()) {
if ((role == null || role.equals(outConnector.getParam(ROLE))) &&
type != null && type.equals(outConnector.getParam(TYPE)) &&
subtype != null && subtype.equals(outConnector.getParam(SUBTYPE))) {
return outConnector;
} else if ((role == null || role.equals(outConnector.getParam(ROLE))) &&
type != null && type.equals(outConnector.getParam(TYPE))) {
return outConnector;
} else if (role != null && role.equals(outConnector.getParam(ROLE))) {
return outConnector;
}
}
if (endpointName == null || registeredReferences.get(endpointName) == null) {
for (OutConnector outConnector : registeredReferences.values()) {
return outConnector;
}
@ -106,9 +120,13 @@ public class ProfileOutputImpl extends CommonNamedReferenceListener<OutConnector
}
@Override
public void sendTo(@Header("ENTAXY_EndpointName") String endpointName, Exchange exchange) {
public void sendTo(@Header("ENTAXY_EndpointName") String endpointName,
@Header(HEADERS_START + ROLE) String role,
@Header(HEADERS_START + TYPE) String type,
@Header(HEADERS_START + SUBTYPE) String subtype,
Exchange exchange) {
try {
getOutConnector(endpointName).send(exchange);
getOutConnector(endpointName, role, type, subtype).send(exchange);
} catch (NullPointerException ex) {
throw new ConnectorNotFound("Out connector for " + systemName + " not found");
}

2
system/registry/system-groups/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry</groupId>
<artifactId>registry</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../registry/pom.xml</relativePath>
</parent>

2
system/registry/system-groups/system-group-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>system-groups</artifactId>
<groupId>ru.entaxy.esb.system.registry.system-groups</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/system-groups/system-group-component/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>system-groups</artifactId>
<groupId>ru.entaxy.esb.system.registry.system-groups</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/system-groups/system-group-impl/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>system-groups</artifactId>
<groupId>ru.entaxy.esb.system.registry.system-groups</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/registry/system-groups/system-group-profile/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.system-groups</groupId>
<artifactId>system-groups</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../system-groups/pom.xml</relativePath>
</parent>

2
system/registry/system-groups/system-group-profile/system-group-profile-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.system-groups.profile</groupId>
<artifactId>system-group-profile</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../system-group-profile/pom.xml</relativePath>
</parent>

2
system/registry/system-groups/system-group-profile/system-group-profile-collector/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.system-groups.profile</groupId>
<artifactId>system-group-profile</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../system-group-profile/pom.xml</relativePath>
</parent>

2
system/registry/system-groups/system-group-profile/system-group-profile-impl-default/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.system-groups.profile</groupId>
<artifactId>system-group-profile</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../system-group-profile/pom.xml</relativePath>
</parent>

2
system/registry/systems/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry</groupId>
<artifactId>registry</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../registry/pom.xml</relativePath>
</parent>

2
system/registry/systems/system-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.systems</groupId>
<artifactId>systems</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../systems/pom.xml</relativePath>
</parent>

14
system/registry/systems/system-api/src/main/java/ru/entaxy/esb/system/jpa/entity/System.java
View File

@ -32,7 +32,7 @@ import java.util.Set;
name = "system-entity-graph",
attributeNodes = {
@NamedAttributeNode(value = "connectors", subgraph = "connectors-subgraph"),
@NamedAttributeNode("exportAlloweds"),
@NamedAttributeNode("exportAllowed"),
@NamedAttributeNode("bundleEntity"),
},
subgraphs = {
@ -84,7 +84,7 @@ public class System {
private Set<Connector> connectors;
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@JoinColumn(name = "system_id")
private Set<ExportAllowed> exportAlloweds;
private Set<ExportAllowed> exportAllowed;
@OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
@JoinColumn(name = "bundle_id")
private BundleEntity bundleEntity;
@ -185,12 +185,12 @@ public class System {
this.connectors = connectors;
}
public Set<ExportAllowed> getExportAlloweds() {
return exportAlloweds;
public Set<ExportAllowed> getExportAllowed() {
return exportAllowed;
}
public void setExportAlloweds(Set<ExportAllowed> exportAlloweds) {
this.exportAlloweds = exportAlloweds;
public void setExportAllowed(Set<ExportAllowed> exportAllowed) {
this.exportAllowed = exportAllowed;
}
public BundleEntity getBundleEntity() {
@ -230,7 +230,7 @@ public class System {
@Override
public int hashCode() {
return Objects.hash(id, uuid, name, description, createDate, editDate, createdBy,
editedBy, version, type, origin, connectors, exportAlloweds);
editedBy, version, type, origin, connectors, exportAllowed);
}
@Override

2
system/registry/systems/system-component/pom.xml
View File

@ -8,7 +8,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.systems</groupId>
<artifactId>systems</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../systems/pom.xml</relativePath>
</parent>

2
system/registry/systems/system-impl/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.systems</groupId>
<artifactId>systems</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../systems/pom.xml</relativePath>
</parent>

6
system/registry/systems/system-impl/src/main/java/ru/entaxy/esb/system/jpa/impl/SystemServiceImpl.java
View File

@ -265,11 +265,11 @@ public class SystemServiceImpl implements SystemService {
@Override
public ExportAllowed addExportAllowed(System system, String exportAllowedName) {
ExportAllowed exportAllowed = getExportAllowed(system.getExportAlloweds(), exportAllowedName);
ExportAllowed exportAllowed = getExportAllowed(system.getExportAllowed(), exportAllowedName);
if (exportAllowed == null) {
exportAllowed = new ExportAllowed();
exportAllowed.setName(exportAllowedName);
system.getExportAlloweds().add(exportAllowed);
system.getExportAllowed().add(exportAllowed);
saveOrUpdate(system);
}
return exportAllowed;
@ -342,7 +342,7 @@ public class SystemServiceImpl implements SystemService {
try (Session session = getSession()) {
session.getTransaction().begin();
ExportAllowed exportAllowed = getExportAllowed(system.getExportAlloweds(), esbName);
ExportAllowed exportAllowed = getExportAllowed(system.getExportAllowed(), esbName);
session.delete(ExportAllowed.class.getName(), exportAllowed);
session.getTransaction().commit();

2
system/registry/systems/system-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View File

@ -96,7 +96,7 @@
</setHeader>
<log message="Set id 0 ${header.SYSTEM.setId(0)}"/>
<log message="Set methods null ${header.SYSTEM.setExportAlloweds(null)}"/>
<log message="Set methods null ${header.SYSTEM.setExportAllowed(null)}"/>
<log message="Set uuid 777 ${header.SYSTEM.setUuid('777')}"/>
<log message="Set name TestSystem ${header.SYSTEM.setName('TestSystem')}"/>
<log message="CREATE NEW Registry with uuid 777"/>

2
system/registry/systems/system-profile/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.systems</groupId>
<artifactId>systems</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../systems/pom.xml</relativePath>
</parent>

2
system/registry/systems/system-profile/system-profile-api/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.systems.profile</groupId>
<artifactId>system-profile</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../system-profile/pom.xml</relativePath>
</parent>

2
system/registry/systems/system-profile/system-profile-collector/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.systems.profile</groupId>
<artifactId>system-profile</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../system-profile/pom.xml</relativePath>
</parent>

2
system/registry/systems/system-profile/system-profile-impl-default/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>ru.entaxy.esb.system.registry.systems.profile</groupId>
<artifactId>system-profile</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../../system-profile/pom.xml</relativePath>
</parent>

4
system/src/main/cfg/ru.entaxy.esb.system.basic_auth.cfg
View File

@ -22,10 +22,10 @@
basic_auth_endpoint.address=/basic-auth-management
#worked and tested on nginX MD5 and SHA-1(recommended)
еncryption.algorithm=SHA-1
encryption.algorithm=SHA-1
#salt for encryption 1 to 8 characters ([\\.\\/a-zA-Z0-9]{1,8})
#when salt changed all password need to remake!
еncryption.salt=kDfq0qZJ
encryption.salt=kDfq0qZJ
#Встроенная аутентификация
internal.authentication.enabled=true

2
system/src/main/cfg/ru.entaxy.esb.system.event.handler.cfg
View File

@ -25,4 +25,4 @@ redelivery.redeliveryDelay=5000
#cron - every 00:00:00,
#cron expression use "+" separator for quartz in camel
quirtz.job.clean.cron=0+0+0+*+*+?+*
quartz.job.clean.cron=0+0+0+*+*+?+*

2
system/src/main/features/features.xml
View File

@ -279,7 +279,7 @@
<feature prerequisite="true">entaxy-legacy-system</feature>
<!-- feature prerequisite="true">entaxy-legacy-deployer</feature -->
<bundle>mvn:ru.entaxy.esb.system.core.dispatcher/dispatcher/${project.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/2.3.29_1</bundle>
<bundle dependency='true'>mvn:org.freemarker/freemarker/${freemarker.version}</bundle>
<bundle>mvn:ru.entaxy.esb.system.management.bundle.jpa/bundle-service/${project.version}</bundle>
<capability>
osgi.service;objectClass=org.hibernate.SessionFactory;effective:=active;

2
system/src/main/healthcheck/generated/fragments.xml
View File

@ -1,5 +1,5 @@
<!-- -->
<configfile finalname="${karaf.etc}/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system.cfg" override="true">
mvn:ru.entaxy.esb.system/system-parent/1.8.1/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system
mvn:ru.entaxy.esb.system/system-parent/1.8.2/cfg/org.apache.felix.hc.generalchecks.BundlesStartedCheck-system
</configfile>
<!-- -->

2
system/system-management/bridge-profile-manager/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>management</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
system/system-management/bridge-profile-manager/src/main/java/ru/entaxy/esb/system/management/bridge/profile/manager/recipient/BridgeProfileRecipientManagerImpl.java
View File

@ -118,7 +118,7 @@ public class BridgeProfileRecipientManagerImpl implements BridgeProfileRecipient
restoreProfile(system);
}
} else {
LOG.info("No bridge brofile founded in system");
LOG.info("No bridge profile founded in system");
}
}
}

2
system/system-management/bundle-manager/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>management</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

51
system/system-management/bundle-manager/src/main/java/ru/entaxy/esb/system/management/bundle/manager/BundleManagerImpl.java
View File

@ -31,9 +31,12 @@ import ru.entaxy.esb.system.management.bundle.jpa.dto.BundleStatus;
import ru.entaxy.esb.system.management.bundle.jpa.entity.BundleType;
import ru.entaxy.platform.base.support.CommonUtils;
import ru.entaxy.platform.core.artifact.Artifact;
import ru.entaxy.platform.core.artifact.ArtifactManifest;
import ru.entaxy.platform.core.artifact.Artifacts;
import ru.entaxy.platform.core.artifact.CapabilityDescriptor;
import ru.entaxy.platform.core.artifact.DeployedArtifact;
import ru.entaxy.platform.core.artifact.Manifested;
import ru.entaxy.platform.core.artifact.capabilities.CapabilityDescriptor;
import ru.entaxy.platform.core.artifact.capabilities.ManifestCapabilityHelper;
import ru.entaxy.platform.core.artifact.legacy.BundleController;
import ru.entaxy.platform.core.artifact.service.ArtifactService;
import ru.entaxy.platform.core.blueprint.generator.Blueprint;
@ -67,9 +70,10 @@ public class BundleManagerImpl implements BundleManager {
private BundleDto doInstallBundle(String bundleName, String templateName, String templateFileName, String bundleType, String bundleVersion,
URL templateUrl, Map<String, String> param, boolean start) throws Exception {
BundleDto bundle = new BundleDto(templateName + "-" + bundleName, BundleType.getValueOf(bundleType.toUpperCase()));
BundleDto bundle = new BundleDto(templateName + "." + bundleName, BundleType.getValueOf(bundleType.toUpperCase()));
Blueprint blueprint = blueprintGenerator.createBlueprint(templateUrl, templateFileName, bundleName, param);
installAndStartBundle(bundleType, bundleVersion, bundle, blueprint, start);
bundle.setBundleName(getFullBundleNameByNameAndType(templateName + "." + bundleName, bundleType));
return bundle;
}
@ -190,22 +194,31 @@ public class BundleManagerImpl implements BundleManager {
// TODO remove hardcode after blueprint-generator is removed
// and all the operations are switched to artifact-management
CapabilityDescriptor descriptor = artifact.provideCapability(artifact.getCoordinates().getGroupId())
.attribute("name", bundle.getBundleName().replace(bundleType + "-", ""))
.attribute("bundleName", bundle.getBundleName());
if (blueprint.getProperties().containsKey("systemName")) {
Object val = blueprint.getProperties().get("systemName");
if (val != null)
descriptor.attribute("system", val.toString());
}
if (blueprint.getProperties().containsKey("template.id")) {
Object val = blueprint.getProperties().get("template.id");
Object val2 = blueprint.getProperties().get("template.name");
if (val != null)
descriptor.attribute("templateId", val.toString());
else
descriptor.attribute("templateId", val2.toString());
descriptor.attribute("templateName", val2.toString());
if (artifact.isManifested()) {
ArtifactManifest artifactManifest = ((Manifested)artifact).getManifest();
ManifestCapabilityHelper capabilityHelper = new ManifestCapabilityHelper(artifactManifest);
CapabilityDescriptor descriptor = capabilityHelper.provideCapability(artifact.getCoordinates().getGroupId())
.attribute("name", bundle.getBundleName().replace(bundleType + "-", ""))
.attribute("bundleName", bundle.getBundleName());
if (blueprint.getProperties().containsKey("systemName")) {
Object val = blueprint.getProperties().get("systemName");
if (val != null)
descriptor.attribute("system", val.toString());
}
if (blueprint.getProperties().containsKey("template.id")) {
Object val = blueprint.getProperties().get("template.id");
Object val2 = blueprint.getProperties().get("template.name");
if (val != null)
descriptor.attribute("templateId", val.toString());
else
descriptor.attribute("templateId", val2.toString());
descriptor.attribute("templateName", val2.toString());
}
capabilityHelper.save();
}
DeployedArtifact deployedArtifact = artifactService.deployShared(artifact);
@ -235,7 +248,7 @@ public class BundleManagerImpl implements BundleManager {
}
protected String getFullBundleNameByNameAndType(String bundleName, String bundleType) {
return Artifact.DEFAULT_RUNTIME_GROUP_ID + "." + bundleType + "." + bundleType + "-" + bundleName;
return Artifact.DEFAULT_RUNTIME_GROUP_ID + "." + bundleType + "." + bundleName;
}
public void setBundleService(BundleService bundleService) {

2
system/system-management/bundle-service/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>management</artifactId>
<groupId>ru.entaxy.esb.system</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/system-management/connector-manager/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>management</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

201
system/system-management/file-upload/LICENSE.txt Normal file
View File

@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
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.

44
system/system-management/file-upload/pom.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>management</artifactId>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>ru.entaxy.esb.system.management.file.upload</groupId>
<artifactId>file-upload</artifactId>
<packaging>bundle</packaging>
<name>SYSTEM :: ENTAXY :: FILE :: UPLOAD</name>
<description>SYSTEM :: ENTAXY :: FILE :: UPLOAD</description>
<properties>
<bundle.osgi.import.pkg>
org.apache.cxf.jaxrs.impl,
org.apache.camel.component.cxf.jaxrs.blueprint,
org.apache.camel.component.cxf.blueprint,
*
</bundle.osgi.import.pkg>
</properties>
<dependencies>
<dependency>
<groupId>ru.entaxy.esb.system.commons</groupId>
<artifactId>system-commons</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf</artifactId>
</dependency>
</dependencies>
</project>

84
system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadProcessor.java Normal file
View File

@ -0,0 +1,84 @@
/*-
* ~~~~~~licensing~~~~~~
* file-upload
* ==========
* Copyright (C) 2020 - 2022 EmDev LLC
* ==========
* 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.
* ~~~~~~/licensing~~~~~~
*/
package ru.entaxy.esb.system.management.file.upload;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.activation.DataHandler;
import javax.ws.rs.core.MultivaluedMap;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.UUID;
public class FileUploadProcessor implements Processor {
private static final Logger log = LoggerFactory.getLogger(FileUploadProcessor.class);
@Override
public void process(Exchange exchange) throws Exception {
Attachment attachment = exchange.getIn().getBody(Attachment.class);
String fileName = "unknown";
DataHandler dataHandler = attachment.getDataHandler();
UUID id = UUID.randomUUID();
InputStream inputStream = null;
OutputStream out = null;
try {
String path = System.getProperty("karaf.data") + "/local-repo/";
if (new File(path + id.toString() + "/").mkdir()) {
path += id.toString() + "/";
inputStream = dataHandler.getInputStream();
MultivaluedMap<String, String> map = attachment.getHeaders();
fileName = getFileName(map);
out = new FileOutputStream(new File(path + fileName));
int read = 0;
byte[] bytes = new byte[1024];
while ((read = inputStream.read(bytes)) != -1) {
out.write(bytes, 0, read);
}
}
} catch (Exception e) {
log.error("Error while upload file: " + e.getMessage());
} finally {
inputStream.close();
out.flush();
out.close();
}
exchange.getMessage().setBody(id.toString());
}
private String getFileName(MultivaluedMap<String, String> header) {
String[] contentDisposition = header.getFirst("Content-Disposition").split(";");
for (String filename : contentDisposition) {
if ((filename.trim().startsWith("filename"))) {
String[] name = filename.split("=");
String exactFileName = name[1].trim().replaceAll("\"", "");
return exactFileName;
}
}
return "unknown";
}
}

35
system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadService.java Normal file
View File

@ -0,0 +1,35 @@
/*-
* ~~~~~~licensing~~~~~~
* file-upload
* ==========
* Copyright (C) 2020 - 2022 EmDev LLC
* ==========
* 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.
* ~~~~~~/licensing~~~~~~
*/
package ru.entaxy.esb.system.management.file.upload;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
@Path("/")
public interface FileUploadService {
@POST
@Path("/post")
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.TEXT_PLAIN)
public String uploadFile(Attachment attachment);
}

38
system/system-management/file-upload/src/main/java/ru/entaxy/esb/system/management/file/upload/FileUploadServiceImpl.java Normal file
View File

@ -0,0 +1,38 @@
/*-
* ~~~~~~licensing~~~~~~
* file-upload
* ==========
* Copyright (C) 2020 - 2022 EmDev LLC
* ==========
* 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.
* ~~~~~~/licensing~~~~~~
*/
package ru.entaxy.esb.system.management.file.upload;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
@Path("/")
public class FileUploadServiceImpl {
@POST
@Path("/post")
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.TEXT_PLAIN)
public String uploadFile(@Multipart(value = "file") Attachment attachment) {
return "I got it";
};
}

45
system/system-management/file-upload/src/main/resources/OSGI-INF/blueprint/camel-context.xml Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~~~~~~licensing~~~~~~
events-rest
==========
Copyright (C) 2020 - 2021 EmDev LLC
==========
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.
~~~~~~/licensing~~~~~~
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
xmlns:camelcxf="http://camel.apache.org/schema/blueprint/cxf"
xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
<bean id="fileUploadProcessor" class="ru.entaxy.esb.system.management.file.upload.FileUploadProcessor"/>
<camelcxf:rsServer id="rsFileUpload"
address="/fileUpload"
serviceClass="ru.entaxy.esb.system.management.file.upload.FileUploadService"
loggingFeatureEnabled="true" loggingSizeLimit="50">
</camelcxf:rsServer>
<camelContext id="file-context" xmlns="http://camel.apache.org/schema/blueprint">
<route id="eventManagement">
<from uri="cxfrs:bean:rsFileUpload?bindingStyle=SimpleConsumer"/>
<process ref="fileUploadProcessor"/>
</route>
</camelContext>
</blueprint>

2
system/system-management/permission-manager/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>management</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

3
system/system-management/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>system-parent</artifactId>
<groupId>ru.entaxy.esb.system</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -24,5 +24,6 @@
<module>bundle-manager</module>
<module>permission-manager</module>
<module>route-manager</module>
<module>file-upload</module>
</modules>
</project>

2
system/system-management/profile-manager/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>management</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/ProfileManagerImpl.java
View File

@ -159,7 +159,7 @@ public class ProfileManagerImpl implements ProfileManager {
}
}
BridgeProfileDto bridgeProfileDto = profileMapper.toBridgeProfileDto(system);
for (ExportAllowed exportAllowed : system.getExportAlloweds()) {
for (ExportAllowed exportAllowed : system.getExportAllowed()) {
bridgeProfileDto.setEsbName(exportAllowed.getName());
bridgeProfileManager.stopBridgeProfile(bridgeProfileDto);
}
@ -172,7 +172,7 @@ public class ProfileManagerImpl implements ProfileManager {
}
}
BridgeProfileDto bridgeProfileDto = profileMapper.toBridgeProfileDto(system);
for (ExportAllowed exportAllowed : system.getExportAlloweds()) {
for (ExportAllowed exportAllowed : system.getExportAllowed()) {
bridgeProfileDto.setEsbName(exportAllowed.getName());
bridgeProfileManager.uninstallBridgeProfile(bridgeProfileDto);
}

10
system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/dto/ProfileDto.java
View File

@ -37,7 +37,7 @@ public class ProfileDto {
private String type;
private String status;
private Set<ConnectorDto> connectors;
private Set<String> exportAlloweds;
private Set<String> exportAllowed;
public String getUuid() {
return uuid;
@ -119,12 +119,12 @@ public class ProfileDto {
this.connectors = connectors;
}
public Set<String> getExportAlloweds() {
return exportAlloweds;
public Set<String> getExportAllowed() {
return exportAllowed;
}
public void setExportAlloweds(Set<String> exportAlloweds) {
this.exportAlloweds = exportAlloweds;
public void setExportAllowed(Set<String> exportAllowed) {
this.exportAllowed = exportAllowed;
}
public String getStatus() {

4
system/system-management/profile-manager/src/main/java/ru/entaxy/esb/system/management/profile/manager/mapper/ProfileMapper.java
View File

@ -61,9 +61,9 @@ public interface ProfileMapper {
})
BundleDto toBundleDto(BundleEntity bundle);
Set<ExportAllowed> toExportAllowedEntities(Set<String> exportAlloweds);
Set<ExportAllowed> toExportAllowedEntities(Set<String> exportAllowed);
Set<String> toExportAlloweds(Set<ExportAllowed> exportAlloweds);
Set<String> toExportAllowed(Set<ExportAllowed> exportAllowed);
default ExportAllowed map(String exportAllowed) {
ExportAllowed exportAllowedEntity = new ExportAllowed();

2
system/system-management/route-manager/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>management</artifactId>
<groupId>ru.entaxy.esb.system</groupId>
<version>1.8.1</version>
<version>1.8.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
system/system-management/system-management-api/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>management</artifactId>
<version>1.8.1</version>
<version>1.8.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
system/system-management/system-management-api/src/main/java/ru/entaxy/esb/system/management/mapper/Mapper.java
View File

@ -58,7 +58,7 @@ public interface Mapper {
@Mappings({
@Mapping(source = "name", target = "profileName"),
@Mapping(source = "connectors", target = "connectorList.connector"),
@Mapping(source = "exportAlloweds", target = "esbNames.esbName"),
@Mapping(source = "exportAllowed", target = "esbNames.esbName"),
@Mapping(source = "editDate", target = "editDate", qualifiedByName = "toEditDate"),
@Mapping(source = "editedBy", target = "editedBy", qualifiedByName = "toEditedBy"),
@Mapping(source = "description", target = "description", qualifiedByName = "toDescription")

20
system/transformer/pom.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ru.entaxy.esb.system</groupId>
<artifactId>system-parent</artifactId>
<version>1.8.1</version>
</parent>
<artifactId>system-transformer</artifactId>
<packaging>jar</packaging>
<name>SYSTEM :: ENTAXY :: TRANSFORMER</name>
<description>SYSTEM :: ENTAXY :: TRANSFORMER</description>
</project>