java

diff --git a/customer/cosar-test-customer/develeopment.yaml b/customer/cosar-test-customer/develeopment.yaml
index b070913f73c163926c12ff7468b9bc67504ff03f..686572b29cc7d387f68ddf7207b35d814e46a3d1 100644 (file)
--- a/customer/cosar-test-customer/develeopment.yaml
+++ b/customer/cosar-test-customer/develeopment.yaml
@@ -2,10 +2,10 @@
 infra::additional_classes:
   - accounts
 
-infra::profile::aem::params::base_dir: '/opt/aem'
-infra::profile::aem::params::user: 'pubadmin'
-infra::profile::aem::params::group: 'pubadmin'
-infra::profile::aem::params::user_home: '/home/pubadmin'
+infra::profile::aem::base_dir: '/opt/aem'
+infra::profile::aem::user: 'pubadmin'
+infra::profile::aem::group: 'pubadmin'
+infra::profile::aem::user_home: '/home/pubadmin'
 
 # Author
 infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmRHmcNKDMnSyGxdcJmXgNzN2rKs3o0beFw2ngSBG5JiDFXwm3o8qiYppdy9m+G7tJ75jycJp7uXoN6ejCjXLQhwIZp3+4MjferW6Sik/ib95aw4EsRwE5qbz7Vh3/oKC+RvV09WHlTSuOGxUNktdsS/zTADOBexAmBPljSV3fXX1yPu9H2kjYtZ34JcZIkO8Hmqug5fNWGZo+UsUcViS7jh5K2ZuQ1MiRGMRE4w1Y9ffbF040OF+AI/9kTvfc8vBUggvj1sLgwyoE5IMm0qtvHPUQIqWrrkY5F9sjAMrCpEyxa1ghTQg1XGEcY5OBjDmxA85Gp7feTvvaTkj3AUwWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDyp1RYBpGRDCBY2ft02xsugBCNhPPi5f7aGGdiSIebuFC3]
@@ -14,6 +14,7 @@ infra::profile::aem::author::license_customer_name: 'SIEMENS AG'
 infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmVzQFFEiOzLFhJDceTBPKdbOzup7PfFlZB0onfQsMCphCwjbGpojA5gk2EcE4avCA14TtyEUxAz+JlU64DhxOiZOrzTy/I9oxXKOkyICnrqEzWcfyaSS4V5goDt1Mw3UhKT7jXxnNrbttMw7w4nGc73D/5Ic6XyWpCQeweQLn90JwF2HUCSUjQkkibLeE+r1bP2FJ8SzK3cdaaMiKRffUyMqtpw7OOb8b3PwiNKhLcjOvo1vVTyF86OBgQp//tzMXksbmfWDmUJyBZpPAnV1uEbgzUc+XNp7mC1dk70Tw0Qnn0g7VTJLUTOCAlql3l8IiggKIyNmQWSs/hcX0KHQLDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCAqq9LK3rNcXns3UXHd29GgBD6GcBlNkkvuR48IZaZe5Ee]
 infra::profile::aem::author::oak_version: 1.2.18
+
 # Publisher
 infra::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmRHmcNKDMnSyGxdcJmXgNzN2rKs3o0beFw2ngSBG5JiDFXwm3o8qiYppdy9m+G7tJ75jycJp7uXoN6ejCjXLQhwIZp3+4MjferW6Sik/ib95aw4EsRwE5qbz7Vh3/oKC+RvV09WHlTSuOGxUNktdsS/zTADOBexAmBPljSV3fXX1yPu9H2kjYtZ34JcZIkO8Hmqug5fNWGZo+UsUcViS7jh5K2ZuQ1MiRGMRE4w1Y9ffbF040OF+AI/9kTvfc8vBUggvj1sLgwyoE5IMm0qtvHPUQIqWrrkY5F9sjAMrCpEyxa1ghTQg1XGEcY5OBjDmxA85Gp7feTvvaTkj3AUwWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDyp1RYBpGRDCBY2ft02xsugBCNhPPi5f7aGGdiSIebuFC3]
 infra::profile::aem::publish::license_product_version: '5.6.1.20130606'

diff --git a/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml b/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
index 1c73c82841ecea6e58052bf0e2ff4515547b6e5e..dceb68b2af8c0000fa8a524017f613d7058382f0 100644 (file)
--- a/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
+++ b/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
@@ -5,10 +5,7 @@ infra::additional_classes:
   - java
   - maven  
   
-java::oracle: jdk8
-java::oracle:version_major: '8u51'
-java::oracle:version_minor: 'b11'
-java::oracle:java_se: 'jdk'    
+java::package: java-1.8.51-oraclejdk 
 
 #aem::author::install_packages:
 infra::profile::aem::author::instance_name: author