Skip to content

Commit 39772c2

Browse files
phaxphax
committed
Naming changes
1 parent c79cef1 commit 39772c2

16 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎phase2-demo-webapp/config/config.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
<!--
4444
<module enabled="true"
4545
classname="com.helger.as2lib.processor.receiver.AS2DirectoryPollingModule"
46-
outboxdir="C:\dev\git\as2-lib\as2-demo-webapp/data/toopenas2a/"
47-
errordir="C:\dev\git\as2-lib\as2-demo-webapp/data/toopenas2a/errors/$date.YYYY$/$date.MM$"
46+
outboxdir="C:\dev\git\phase2\as2-demo-webapp/data/toopenas2a/"
47+
errordir="C:\dev\git\phase2\as2-demo-webapp/data/toopenas2a/errors/$date.YYYY$/$date.MM$"
4848
stored_error_filename="$msg.attributes.filename$-$date.YYYY$-$date.MM$-$msg.headers.message-id$"
49-
sentdir="C:\dev\git\as2-lib\as2-demo-webapp/data/$msg.sender.as2_id$-$msg.receiver.as2_id$/sent/$date.YYYY$/$date.MM$"
49+
sentdir="C:\dev\git\phase2\as2-demo-webapp/data/$msg.sender.as2_id$-$msg.receiver.as2_id$/sent/$date.YYYY$/$date.MM$"
5050
stored_sent_filename="$msg.attributes.filename$-$msg.headers.message-id$"
5151
interval="5"
5252
defaults="sender.as2_id=openas2b, receiver.as2_id=openas2a"

‎phase2-demo-webapp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@
119119
<Bundle-ClassPath>
120120
WEB-INF/classes,
121121
WEB-INF/lib/activation-1.1.1.jar,
122-
WEB-INF/lib/as2-lib-4.4.3-SNAPSHOT.jar,
123-
WEB-INF/lib/as2-servlet-4.4.3-SNAPSHOT.jar,
122+
WEB-INF/lib/phase2-lib-4.4.3-SNAPSHOT.jar,
123+
WEB-INF/lib/phase2-servlet-4.4.3-SNAPSHOT.jar,
124124
WEB-INF/lib/bcmail-jdk15on-1.62.jar,
125125
WEB-INF/lib/bcpkix-jdk15on-1.62.jar,
126126
WEB-INF/lib/bcprov-jdk15on-1.62.jar,

‎phase2-lib/src/main/java/com/helger/phase2/crypto/ECompressionType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import jakarta.annotation.Nullable;
4444

4545
/**
46-
* Define the supported SMIME compression types for as2-lib.
46+
* Define the supported SMIME compression types for phase2.
4747
*
4848
* @author Philip Helger
4949
*/

‎phase2-lib/src/main/java/com/helger/phase2/crypto/MIC.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public MIC getClone ()
105105
}
106106

107107
/**
108-
* Special unification for https://github.com/phax/as2-lib/issues/75
108+
* Special unification for https://github.com/phax/phase2/issues/75
109109
*
110110
* @param eAlgorithm
111111
* Source algorithm. May not be <code>null</code>.

‎phase2-lib/src/main/java/com/helger/phase2/params/MessageParameters.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public String getParameter (@Nonnull final String sKey) throws AS2InvalidParamet
138138
@Nullable
139139
public static String getEscapedString (@Nullable final String sUnescaped)
140140
{
141-
// Based on https://github.com/phax/as2-lib/pull/19
141+
// Based on https://github.com/phax/phase2/pull/19
142142
return StringReplace.replaceAll (sUnescaped, "$", "$$");
143143
}
144144
}

‎phase2-lib/src/main/java/com/helger/phase2/partner/IRefreshablePartnershipFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
import com.helger.phase2.exception.AS2Exception;
3636

3737
/**
38-
* A partnership factory that can be refreshed. Was moved from as2-server to as2-lib in v4.3.0.
38+
* A partnership factory that can be refreshed.
3939
*
4040
* @author Philip Helger
4141
*/
4242
public interface IRefreshablePartnershipFactory extends IPartnershipFactory
4343
{
4444
/**
4545
* Refresh the partnership factory.
46-
*
46+
*
4747
* @throws AS2Exception
4848
* On error
4949
*/

‎phase2-lib/src/main/java/com/helger/phase2/util/AS2ResourceHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
*/
7171
public class AS2ResourceHelper implements Closeable
7272
{
73-
private static final String TEMP_FILE_PREFIX = "as2-lib-res-";
73+
private static final String TEMP_FILE_PREFIX = "phase2-res-";
7474
private static final String TEMP_FILE_SUFFIX = ".tmp";
7575
private static final Logger LOGGER = LoggerFactory.getLogger (AS2ResourceHelper.class);
7676

‎phase2-lib/src/test/java/com/helger/phase2/supplementary/main/MainIssue45.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static void main (final String [] args) throws Exception
8484
aSettings.setKeyStore (EKeyStoreType.PKCS12, new File ("src/test/resources/external/mendelson/key3.pfx"), "test");
8585

8686
// Fixed sender
87-
aSettings.setSenderData ("mycompanyAS2", "phax.as2-lib@github.com", "key3");
87+
aSettings.setSenderData ("mycompanyAS2", "phax.phase2@github.com", "key3");
8888

8989
// Fixed receiver - key alias must be "mendelsontestAS2"
9090
aSettings.setReceiverData ("mendelsontestAS2",
@@ -103,13 +103,13 @@ public static void main (final String [] args) throws Exception
103103

104104
aSettings.setEncryptAndSign (eCryptAlgo, eSignAlgo);
105105
aSettings.setCompress (ECompressionType.ZLIB, bCompress);
106-
aSettings.setMessageIDFormat ("github-phax-as2-lib-$date.ddMMuuuuHHmmssZ$-$rand.1234$@$msg.sender.as2_id$_$msg.receiver.as2_id$");
106+
aSettings.setMessageIDFormat ("github-phax-phase2-$date.ddMMuuuuHHmmssZ$-$rand.1234$@$msg.sender.as2_id$_$msg.receiver.as2_id$");
107107
aSettings.setRetryCount (1);
108108
aSettings.setConnectTimeout (Timeout.ofSeconds (10));
109109
aSettings.setResponseTimeout (Timeout.ofSeconds (10));
110110

111111
// Build client request
112-
final AS2ClientRequest aRequest = new AS2ClientRequest ("AS2 test message from as2-lib");
112+
final AS2ClientRequest aRequest = new AS2ClientRequest ("AS2 test message from phase2");
113113
aRequest.setData (new File ("src/test/resources/mendelson/testcontent.attachment"), Charset.defaultCharset ());
114114
aRequest.setContentType (CMimeType.TEXT_PLAIN.getAsString ());
115115

‎phase2-lib/src/test/java/com/helger/phase2/supplementary/main/MainSendToLocalhost8080.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public static void main (final String [] args) throws Exception
8989
aSettings.setKeyStore (EKeyStoreType.PKCS12, new File ("src/test/resources/localhost/certs.p12"), "test");
9090

9191
// Fixed sender
92-
aSettings.setSenderData ("mycompanyAS2", "phax.as2-lib@github.com", "openas2a_alias");
92+
aSettings.setSenderData ("mycompanyAS2", "phax.phase2@github.com", "openas2a_alias");
9393

9494
// Fixed receiver - key alias must be "openas2b_alias"
9595
aSettings.setReceiverData ("openas2b_alias", "openas2b_alias", "http://localhost:8080/as2");
@@ -112,14 +112,14 @@ public static void main (final String [] args) throws Exception
112112

113113
aSettings.setEncryptAndSign (eCryptAlgo, eSignAlgo);
114114
aSettings.setCompress (eCompress, bCompressBeforeSigning);
115-
aSettings.setMessageIDFormat ("github-phax-as2-lib-$date.uuuuMMdd-HHmmssZ$-$rand.1234$@$msg.sender.as2_id$_$msg.receiver.as2_id$");
115+
aSettings.setMessageIDFormat ("github-phax-phase2-$date.uuuuMMdd-HHmmssZ$-$rand.1234$@$msg.sender.as2_id$_$msg.receiver.as2_id$");
116116
aSettings.setRetryCount (1);
117117
aSettings.setConnectTimeout (Timeout.ofSeconds (10));
118118
aSettings.setResponseTimeout (Timeout.ofSeconds (10));
119119
aSettings.setHttpOutgoingDumperFactory (aOutgoingDumperFactory);
120120

121121
// Build client request
122-
final AS2ClientRequest aRequest = new AS2ClientRequest ("AS2 test message from as2-lib");
122+
final AS2ClientRequest aRequest = new AS2ClientRequest ("AS2 test message from phase2");
123123
aRequest.setData (new DataHandler (new FileDataSource (new File ("src/test/resources/external/mendelson/testcontent.attachment"))));
124124
aRequest.setContentType (CMimeType.TEXT_PLAIN.getAsString ());
125125

‎phase2-lib/src/test/java/com/helger/phase2/supplementary/main/MainSendToMendelsonTestServer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public static void main (final String [] args) throws Exception
8888
aSettings.setKeyStore (EKeyStoreType.PKCS12, new File ("src/test/resources/external/mendelson/key3.pfx"), "test");
8989

9090
// Fixed sender
91-
aSettings.setSenderData ("mycompanyAS2", "phax.as2-lib@github.com", "key3");
91+
aSettings.setSenderData ("mycompanyAS2", "phax.phase2@github.com", "key3");
9292

9393
// Fixed receiver - key alias must be "mendelsontestAS2"
9494
aSettings.setReceiverData ("mendelsontestAS2",
@@ -115,14 +115,14 @@ public static void main (final String [] args) throws Exception
115115

116116
aSettings.setEncryptAndSign (eCryptAlgo, eSignAlgo);
117117
aSettings.setCompress (eCompress, bCompressBeforeSigning);
118-
aSettings.setMessageIDFormat ("github-phax-as2-lib-$date.uuuuMMdd-HHmmssZ$-$rand.1234$@$msg.sender.as2_id$_$msg.receiver.as2_id$");
118+
aSettings.setMessageIDFormat ("github-phax-phase2-$date.uuuuMMdd-HHmmssZ$-$rand.1234$@$msg.sender.as2_id$_$msg.receiver.as2_id$");
119119
aSettings.setRetryCount (1);
120120
aSettings.setConnectTimeout (Timeout.ofSeconds (10));
121121
aSettings.setResponseTimeout (Timeout.ofSeconds (10));
122122
aSettings.setHttpOutgoingDumperFactory (aOutgoingDumperFactory);
123123

124124
// Build client request
125-
final AS2ClientRequest aRequest = new AS2ClientRequest ("AS2 test message from as2-lib");
125+
final AS2ClientRequest aRequest = new AS2ClientRequest ("AS2 test message from phase2");
126126
aRequest.setData (new DataHandler (new FileDataSource (new File ("src/test/resources/external/mendelson/testcontent.attachment"))));
127127
aRequest.setContentType (CMimeType.TEXT_PLAIN.getAsString ());
128128

0 commit comments

Comments
 (0)