Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update modules to assimbly.org #1

Merged
merged 3 commits into from
Feb 20, 2023
Merged

Update modules to assimbly.org #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0d91ab
read soap.cacheExpirationInHours property from world.dovetail.soap.cfg
skin27 Feb 20, 2023
190e5a3
start new release 4.0.0
skin27 Feb 20, 2023
8365ddb
update modules to assimbly.org
skin27 Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions aggregate/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>custom-components</artifactId>
<groupId>world.dovetail</groupId>
<version>3.9.0</version>
<groupId>org.assimbly</groupId>
<version>4.0.0</version>
</parent>

<artifactId>aggregate</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aggregate/src/docs/aggregate.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ for this component:
[source,xml]
------------------------------------------------------------
<dependency>
<groupId>world.dovetail</groupId>
<groupId>org.assimbly</groupId>
<artifactId>aggregate</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Assimbly version -->
Expand Down
6 changes: 3 additions & 3 deletions ...dovetail/aggregate/AggregateStrategy.java → ...assimbly/aggregate/AggregateStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package world.dovetail.aggregate;
package org.assimbly.aggregate;

import org.apache.camel.AggregationStrategy;
import org.apache.log4j.Logger;
import world.dovetail.aggregate.json.JsonAggregateStrategy;
import world.dovetail.aggregate.xml.XmlAggregateStrategy;
import org.assimbly.aggregate.json.JsonAggregateStrategy;
import org.assimbly.aggregate.xml.XmlAggregateStrategy;
import org.apache.camel.Exchange;

public class AggregateStrategy implements AggregationStrategy {
Expand Down
2 changes: 1 addition & 1 deletion ...aggregate/json/JsonAggregateStrategy.java → ...aggregate/json/JsonAggregateStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aggregate.json;
package org.assimbly.aggregate.json;

import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
Expand Down
2 changes: 1 addition & 1 deletion ...l/aggregate/xml/XmlAggregateStrategy.java → ...y/aggregate/xml/XmlAggregateStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aggregate.xml;
package org.assimbly.aggregate.xml;

import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
Expand Down
4 changes: 2 additions & 2 deletions aleris/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>custom-components</artifactId>
<groupId>world.dovetail</groupId>
<version>3.9.0</version>
<groupId>org.assimbly</groupId>
<version>4.0.0</version>
</parent>

<artifactId>aleris</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion aleris/src/docs/aleris.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ for this component:
[source,xml]
------------------------------------------------------------
<dependency>
<groupId>world.dovetail</groupId>
<groupId>org.assimbly</groupId>
<artifactId>aleris</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Assimbly version -->
Expand Down
2 changes: 1 addition & 1 deletion ...orld/dovetail/aleris/AlerisComponent.java → .../org/assimbly/aleris/AlerisComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris;
package org.assimbly.aleris;

import org.apache.camel.Component;
import org.apache.camel.Endpoint;
Expand Down
6 changes: 3 additions & 3 deletions ...etail/aleris/AlerisTxtToXmlProcessor.java → ...imbly/aleris/AlerisTxtToXmlProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package world.dovetail.aleris;
package org.assimbly.aleris;

import world.dovetail.aleris.certificate.Certificates;
import world.dovetail.aleris.converter.AlerisCertificateConverter;
import org.assimbly.aleris.certificate.Certificates;
import org.assimbly.aleris.converter.AlerisCertificateConverter;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;

Expand Down
4 changes: 2 additions & 2 deletions ...vetail/aleris/CertificatesMarshaller.java → ...simbly/aleris/CertificatesMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package world.dovetail.aleris;
package org.assimbly.aleris;

import world.dovetail.aleris.certificate.Certificates;
import org.assimbly.aleris.certificate.Certificates;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
Expand Down
2 changes: 1 addition & 1 deletion ...etail/aleris/certificate/Certificate.java → ...imbly/aleris/certificate/Certificate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.certificate;
package org.assimbly.aleris.certificate;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...tail/aleris/certificate/Certificates.java → ...mbly/aleris/certificate/Certificates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.certificate;
package org.assimbly.aleris.certificate;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...eris/certificate/ChemicalComposition.java → ...eris/certificate/ChemicalComposition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.certificate;
package org.assimbly.aleris.certificate;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion .../dovetail/aleris/certificate/Company.java → .../assimbly/aleris/certificate/Company.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.certificate;
package org.assimbly.aleris.certificate;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...ovetail/aleris/certificate/Component.java → ...ssimbly/aleris/certificate/Component.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.certificate;
package org.assimbly.aleris.certificate;


import org.apache.commons.lang3.builder.EqualsBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...leris/certificate/MechanicalProperty.java → ...leris/certificate/MechanicalProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.certificate;
package org.assimbly.aleris.certificate;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...ovetail/aleris/certificate/StockUnit.java → ...ssimbly/aleris/certificate/StockUnit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.certificate;
package org.assimbly.aleris.certificate;

import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
Expand Down
4 changes: 2 additions & 2 deletions ...converter/AlerisCertificateConverter.java → ...converter/AlerisCertificateConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import world.dovetail.aleris.certificate.*;
import org.assimbly.aleris.certificate.*;

import java.util.*;
import java.util.stream.Collectors;
Expand Down
2 changes: 1 addition & 1 deletion .../converter/AlerisCertificateSplitter.java → .../converter/AlerisCertificateSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down
2 changes: 1 addition & 1 deletion ...erter/AlerisChemicalAnalysisSplitter.java → ...erter/AlerisChemicalAnalysisSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...converter/AlerisCrateContentSplitter.java → ...converter/AlerisCrateContentSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import java.util.HashMap;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...leris/converter/AlerisHeaderSplitter.java → ...leris/converter/AlerisHeaderSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down
2 changes: 1 addition & 1 deletion ...r/AlerisMechanicalPropertiesSplitter.java → ...r/AlerisMechanicalPropertiesSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...l/aleris/converter/AlerisUnitMatcher.java → ...y/aleris/converter/AlerisUnitMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import java.util.regex.Pattern;

Expand Down
2 changes: 1 addition & 1 deletion ...er/IllegalAlerisCertificateException.java → ...er/IllegalAlerisCertificateException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

public class IllegalAlerisCertificateException extends RuntimeException {
public IllegalAlerisCertificateException(String message) {
Expand Down
2 changes: 1 addition & 1 deletion aleris/src/main/resources/META-INF/services/org/apache/camel/component/aleris
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
class=world.dovetail.aleris.AlerisComponent
class=org.assimbly.aleris.AlerisComponent
2 changes: 1 addition & 1 deletion ...leris/AlerisComponentIntegrationTest.java → ...leris/AlerisComponentIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris;
package org.assimbly.aleris;

import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
Expand Down
4 changes: 2 additions & 2 deletions .../dovetail/aleris/CertificatesCreator.java → .../assimbly/aleris/CertificatesCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package world.dovetail.aleris;
package org.assimbly.aleris;

import world.dovetail.aleris.certificate.*;
import org.assimbly.aleris.certificate.*;

import java.util.ArrayList;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...il/aleris/CertificatesMarshallerTest.java → ...ly/aleris/CertificatesMarshallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package world.dovetail.aleris;
package org.assimbly.aleris;

import org.apache.commons.io.IOUtils;

import org.junit.jupiter.api.Test;

import world.dovetail.aleris.certificate.*;
import org.assimbly.aleris.certificate.*;


import javax.xml.bind.JAXBException;
Expand Down
9 changes: 3 additions & 6 deletions ...erter/AlerisCertificateConverterTest.java → ...erter/AlerisCertificateConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import org.apache.commons.io.IOUtils;
import world.dovetail.aleris.CertificatesCreator;
import world.dovetail.aleris.certificate.Certificates;
import org.assimbly.aleris.CertificatesCreator;
import org.assimbly.aleris.certificate.Certificates;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...verter/AlerisCertificateSplitterTest.java → ...verter/AlerisCertificateSplitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import org.junit.Assert;
import org.junit.Before;
Expand Down
2 changes: 1 addition & 1 deletion ...r/AlerisChemicalAnalysisSplitterTest.java → ...r/AlerisChemicalAnalysisSplitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import org.junit.Assert;
import org.junit.Before;
Expand Down
2 changes: 1 addition & 1 deletion ...erter/AlerisCrateContentSplitterTest.java → ...erter/AlerisCrateContentSplitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import org.junit.Assert;
import org.junit.Before;
Expand Down
2 changes: 1 addition & 1 deletion ...s/converter/AlerisHeaderSplitterTest.java → ...s/converter/AlerisHeaderSplitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import org.junit.Assert;
import org.junit.Before;
Expand Down
2 changes: 1 addition & 1 deletion ...erisMechanicalPropertiesSplitterTest.java → ...erisMechanicalPropertiesSplitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import org.junit.Assert;
import org.junit.Before;
Expand Down
2 changes: 1 addition & 1 deletion ...eris/converter/AlerisUnitMatcherTest.java → ...eris/converter/AlerisUnitMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.aleris.converter;
package org.assimbly.aleris.converter;

import org.junit.Assert;
import org.junit.Before;
Expand Down
4 changes: 2 additions & 2 deletions amazon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>custom-components</artifactId>
<groupId>world.dovetail</groupId>
<version>3.9.0</version>
<groupId>org.assimbly</groupId>
<version>4.0.0</version>
</parent>

<artifactId>amazon</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion amazon/src/docs/amazon.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ for this component:
[source,xml]
------------------------------------------------------------
<dependency>
<groupId>world.dovetail</groupId>
<groupId>org.assimbly</groupId>
<artifactId>amazon</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Assimbly version -->
Expand Down
2 changes: 1 addition & 1 deletion ...orld/dovetail/amazon/AmazonComponent.java → .../org/assimbly/amazon/AmazonComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.amazon;
package org.assimbly.amazon;

import org.apache.camel.Endpoint;
import org.apache.camel.support.DefaultComponent;
Expand Down
12 changes: 6 additions & 6 deletions .../dovetail/amazon/AmazonConfiguration.java → .../assimbly/amazon/AmazonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package world.dovetail.amazon;
package org.assimbly.amazon;

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
import world.dovetail.amazon.domain.Amazon;
import world.dovetail.amazon.domain.Marketplace;
import world.dovetail.amazon.domain.Operation;
import world.dovetail.amazon.domain.Region;
import world.dovetail.amazon.exception.MarketplaceNotFoundException;
import org.assimbly.amazon.domain.Amazon;
import org.assimbly.amazon.domain.Marketplace;
import org.assimbly.amazon.domain.Operation;
import org.assimbly.amazon.domain.Region;
import org.assimbly.amazon.exception.MarketplaceNotFoundException;
import org.assimbly.util.helper.Base64Helper;

import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion ...world/dovetail/amazon/AmazonEndpoint.java → ...a/org/assimbly/amazon/AmazonEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.amazon;
package org.assimbly.amazon;

import org.apache.camel.Processor;
import org.apache.camel.spi.UriEndpoint;
Expand Down
8 changes: 4 additions & 4 deletions ...orld/dovetail/amazon/AmazonProcessor.java → .../org/assimbly/amazon/AmazonProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.amazon;
package org.assimbly.amazon;

import com.google.common.collect.ImmutableMap;

Expand All @@ -7,9 +7,9 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;

import world.dovetail.amazon.domain.Operation;
import world.dovetail.amazon.service.AmazonService;
import world.dovetail.amazon.service.AmazonServiceImpl;
import org.assimbly.amazon.domain.Operation;
import org.assimbly.amazon.service.AmazonService;
import org.assimbly.amazon.service.AmazonServiceImpl;
import org.assimbly.util.Pair;
import org.assimbly.util.helper.XmlHelper;

Expand Down
2 changes: 1 addition & 1 deletion .../world/dovetail/amazon/api/AmazonApi.java → ...va/org/assimbly/amazon/api/AmazonApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.amazon.api;
package org.assimbly.amazon.api;

public interface AmazonApi {

Expand Down
6 changes: 3 additions & 3 deletions ...tail/amazon/api/AmazonMarketplaceApi.java → ...mbly/amazon/api/AmazonMarketplaceApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package world.dovetail.amazon.api;
package org.assimbly.amazon.api;

import org.apache.commons.codec.CharEncoding;
import org.apache.http.HttpResponse;
Expand All @@ -11,7 +11,7 @@
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import world.dovetail.amazon.domain.Marketplace;
import org.assimbly.amazon.domain.Marketplace;
import org.assimbly.util.Pair;
import org.assimbly.util.helper.Base64Helper;

Expand Down Expand Up @@ -71,7 +71,7 @@ Pair<StatusLine, String> post(List<NameValuePair> form, String body) throws Exce
HttpClient httpClient = HttpClients.createDefault();
HttpPost request = new HttpPost(builder.build());

request.setHeader("x-amazon-user-agent", "Dovetail/4.0.0");
request.setHeader("x-amazon-user-agent", "Assimbly/4.0.0");

if(body != null) {
StringEntity entity = new StringEntity(body, "UTF-8");
Expand Down
4 changes: 2 additions & 2 deletions ...a/world/dovetail/amazon/api/FeedsApi.java → ...ava/org/assimbly/amazon/api/FeedsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package world.dovetail.amazon.api;
package org.assimbly.amazon.api;

import org.apache.http.NameValuePair;
import org.apache.http.StatusLine;
import world.dovetail.amazon.domain.Marketplace;
import org.assimbly.amazon.domain.Marketplace;
import org.assimbly.util.Pair;

import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions .../world/dovetail/amazon/api/OrdersApi.java → ...va/org/assimbly/amazon/api/OrdersApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package world.dovetail.amazon.api;
package org.assimbly.amazon.api;

import org.apache.http.NameValuePair;
import org.apache.http.StatusLine;
import world.dovetail.amazon.domain.Marketplace;
import org.assimbly.amazon.domain.Marketplace;
import org.assimbly.util.Pair;

import java.util.List;
Expand Down
Loading