Skip to content

Commit

Permalink
Merge pull request #1 from amusarra/feature/migrate-to-liferay-73
Browse files Browse the repository at this point in the history
Migrate to Liferay 7.3
  • Loading branch information
amusarra committed Jun 24, 2021
2 parents cc81f76 + 8aba8d5 commit e8eb6c7
Show file tree
Hide file tree
Showing 75 changed files with 488 additions and 467 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.3.0] - Jun 23, 2021
- Added support to Liferay 7.3 GA6

## [1.2.3] - Sep 26, 2019
- Minor fix and added Converter JAXB

## [1.2.2] - Sep 26, 2019
- Added modules for integration with UE VIES VAT services

## [1.2.1] - Sep 23, 2019
- Added the samples soap request and SOAP UI Project

## [1.2.0] - Sep 16, 2019
- Added the JAX-WS Handler modules sample

## [1.1.0] - Sep 12, 2019
- Added SOAP Client with the Mutual Authentication support

## [1.0.0] - Sep 4, 2019
- First release for Liferay 7.0 Community Edition
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Antonio Musarra's Blog - https://www.dontesta.it
Copyright (c) 2009-present Antonio Musarra's Blog - https://www.dontesta.it

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
312 changes: 143 additions & 169 deletions README.markdown

Large diffs are not rendered by default.

Binary file modified docs/images/ConfigurationSOAPExternalService_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/ConfigurationSOAPExternalService_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
318 changes: 145 additions & 173 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,174 +1,146 @@

# Set the directory where the downloaded bundle Zip files are stored. The
# default value is the ".liferay/bundles" folder inside the user home
# directory.
#
#liferay.workspace.bundle.cache.dir=~/.liferay/bundles

#
# Set this to true if the "liferay.workspace.bundle.url" property is set to
# a DXP bundle Zip. This property allows the token residing in the
# "~/.liferay" folder to be used to validate your user credentials when
# downloading the bundle. The default value is false.
#
#liferay.workspace.bundle.token.download=false

#
# Set the email address to use when downloading a DXP bundle. This is used
# to create the authentication token. The email address must match the one
# registered for your DXP subscription.
#
# If you wish to create a new token without providing your email address and
# password in this file, you can create a token manually by navigating to
# your Liferay profile's Account Setting page and generating a token in the
# Authentication Tokens menu. Your token must reside in the "~/.liferay"
# folder.
#
#liferay.workspace.bundle.token.email.address=

#
# Set this to true to override the existing token with a newly generated
# token created by the "createToken" task. The default value is false.
#
#liferay.workspace.bundle.token.force=false

#
# Set the password to use when downloading a DXP bundle. This is used to
# create the authentication token. The password must match the one
# registered for your DXP subscription. See the
# "liferay.workspace.bundle.token.email.address" property for more details.
#
#liferay.workspace.bundle.token.password=

#
# Set the file to hold the Liferay bundle authentication token password.
# The default file value is "~/.liferay/token".
#
#liferay.workspace.bundle.token.password.file=

#
# Set the URL pointing to the bundle Zip to download. If the URL points to a
# DXP bundle (e.g., https://api.liferay.com/...), set the
# "liferay.workspace.bundle.token.download" property to true. The default
# value is the URL for Liferay Portal CE 7.0 GA7, Liferay Portal CE 7.1 GA4,
# or Liferay Portal CE 7.2 GA1, depending on the portal version the
# workspace is targeting.
#
liferay.workspace.bundle.url=https://releases-cdn.liferay.com/portal/7.2.0-ga1/liferay-ce-portal-tomcat-7.2.0-ga1-20190531153709761.tar.gz

#
# Set the "app.server.tomcat.version" to match what is contained inside the
# Liferay bundle. Both the TestIntegrationPlugin and and LiferayExtPlugin
# rely on this version to match the bundled Tomcat version. If your
# configured bundle url points to a bundle with a different Tomcat version,
# set the property below to match that Tomcat version.
#
app.server.tomcat.version=9.0.17

#
# Set this to true to configure Liferay CDN as the default repository in the
# root project. The default value is true.
#
#liferay.workspace.default.repository.enabled=true

#
# Set the Liferay Portal Docker image to create your container from. The
# default value points to Liferay Portal CE 7.2 GA1.
#
#liferay.workspace.docker.image.liferay=liferay/portal:7.2.0-ga1

#
# Set the environment with the settings appropriate for current development.
# The "configs" folder is used to hold different environments in the same
# workspace. You can organize environment settings and generate an
# environment installation with those settings. There are five
# environments: common, dev, docker, local, prod, and uat. The default value
# is "local".
#
#liferay.workspace.environment=local

#
# Set the folder that contains the Liferay bundle downloaded from the
# "liferay.workspace.bundle.url" property. The default value is "bundles".
#
#liferay.workspace.home.dir=bundles

#
# Set this to true to configure Liferay CDN as the default repository for
# module/OSGi projects. The default value is true.
#
#liferay.workspace.modules.default.repository.enabled=true

#
# Set the folder that contains all Ext OSGi modules and Ext plugins. The
# default value is "ext".
#
#liferay.workspace.ext.dir=ext

#
# Set the folder that contains all module/OSGi projects. The default value
# is "modules".
#
#liferay.workspace.modules.dir=modules

#
# Set this to true to compile the JSP files in OSGi modules and have them
# added to the distributable Zip/Tar. The default value is false.
#
#liferay.workspace.modules.jsp.precompile.enabled=false

#
# Set the folder that contains the Plugins SDK environment. The default
# value is "plugins-sdk".
#
#liferay.workspace.plugins.sdk.dir=plugins-sdk

#
# Set the Liferay Portal or DXP version to develop and test against. By
# setting this property, it enables the target platform features such as
# dependency management and OSGi resolve tasks. Use the version that
# matches the Liferay Portal or DXP bundle version in this workspace.
#
# For a list of all available target platform versions, see
# https://bit.ly/2IkAwwW for Liferay Portal and https://bit.ly/2GIyfZF for
# Liferay DXP.
#
#liferay.workspace.target.platform.version=7.2.0

#
# Set this to true if you have enabled the Target Platform plugin (i.e. you
# have set the above property) and you want to apply the TargetPlatformIDE
# plugin to the root workspace project. This will cause all of the BOM
# artifacts jars and their Java sources to be indexed by your IDE. Setting
# this property to true can slow down your IDE's project synchronization.
#
# target.platform.index.sources=false

#
# Set the folder that contains Node.js-style theme projects. The default
# value is "themes".
#
#liferay.workspace.themes.dir=themes

#
# Set this to true to build the theme projects using the Liferay Portal
# Tools Theme Builder. The default value is false.
#
#liferay.workspace.themes.java.build=false

#
# Set the folder that contains classic WAR-style projects. The default value
# is "wars".
#
#liferay.workspace.wars.dir=wars


#
# Set the subscription key for Microsoft Translation integration.
# Subscription to the Translator Text Translation API on Microsoft Cognitive
# Services is required. Basic subscriptions, up to 2 million characters a
# month, are free. See
# http://docs.microsofttranslator.com/text-translate.html for more
# information.
#
microsoft.translator.subscription.key=
#
# Set this property to override the default setting provided by
# "liferay.workspace.product". Set the "app.server.tomcat.version" to match
# what is contained inside the Liferay bundle. Both the
# TestIntegrationPlugin and and LiferayExtPlugin rely on this version to
# match the bundled Tomcat version. If your configured bundle url points to
# a bundle with a different Tomcat version, set the property below to match
# that Tomcat version.
#
#app.server.tomcat.version=9.0.37

#
# Set the directory where the downloaded bundle Zip files are stored. The
# default value is the ".liferay/bundles" folder inside the user home
# directory.
#
#liferay.workspace.bundle.cache.dir=~/.liferay/bundles

#
# Set this property to override the default setting provided by
# "liferay.workspace.product". Set the URL pointing to the bundle Zip to
# download. (e.g., https://releases-cdn.liferay.com/portal...)
#
#liferay.workspace.bundle.url=https://releases-cdn.liferay.com/portal/7.3.5-ga6/liferay-ce-portal-tomcat-7.3.5-ga6-20200924034643403.tar.gz

#
# Set this to true to configure Liferay CDN as the default repository in the
# root project. The default value is true.
#
#liferay.workspace.default.repository.enabled=true

#
# Set this property to override the default setting provided by
# "liferay.workspace.product". Set the Liferay Portal Docker image to create
# your container from. The default value points to Liferay Portal CE 7.3
# GA6.
#
#liferay.workspace.docker.image.liferay=liferay/portal:7.3.5-ga6

#
# Set the environment with the settings appropriate for current development.
# The "configs" folder is used to hold different environments in the same
# workspace. You can organize environment settings and generate an
# environment installation with those settings. There are five environments:
# common, dev, docker, local, prod, and uat. The default value is "local".
#
#liferay.workspace.environment=local

#
# Set the folder that contains all Ext OSGi modules and Ext plugins. The
# default value is "ext".
#
#liferay.workspace.ext.dir=ext

#
# Set the folder that contains the Liferay bundle downloaded from the
# "liferay.workspace.bundle.url" property. The default value is "bundles".
#
#liferay.workspace.home.dir=bundles

#
# Set this to true to configure Liferay CDN as the default repository for
# module/OSGi projects. The default value is true.
#
#liferay.workspace.modules.default.repository.enabled=true

#
# Set the folder that contains all module projects. The default value is set
# to "modules". Set to "*" to search all subdirectories.
#
liferay.workspace.modules.dir=modules

#
# Set this to true to compile the JSP files in OSGi modules and have them
# added to the distributable Zip/Tar. The default value is false.
#
#liferay.workspace.modules.jsp.precompile.enabled=false

#
# Set this property to "yarn" to build Node.js-style projects using Yarn.
# The default value is npm.
#
#liferay.workspace.node.package.manager=npm

#
# Set the folder that contains the Plugins SDK environment. The default
# value is "plugins-sdk".
#
#liferay.workspace.plugins.sdk.dir=plugins-sdk

#
# Set the "liferay.workspace.product" to set the
# "app.server.tomcat.version", "liferay.workspace.bundle.url",
# "liferay.workspace.docker.image.liferay", and
# "liferay.workspace.target.platform.version" that matches your Liferay
# Product Version. To override each of these settings, set them
# individually.
#
liferay.workspace.product=portal-7.3-ga6

#
# Set this property to override the default setting provided by
# "liferay.workspace.product". Set the Liferay Portal or DXP version to
# develop and test against. By setting this property, it enables the target
# platform features such as dependency management and OSGi resolve tasks.
# Use the version that matches the Liferay Portal or DXP bundle version in
# this workspace.
#
# For a list of all available target platform versions, see
# https://bit.ly/2IkAwwW for Liferay Portal and https://bit.ly/2GIyfZF for
# Liferay DXP.
#
#liferay.workspace.target.platform.version=7.3.5

#
# Set the folder that contains Node.js-style theme projects. The default
# value is "themes".
#
#liferay.workspace.themes.dir=themes

#
# Set this to true to build the theme projects using the Liferay Portal
# Tools Theme Builder. The default value is false.
#
#liferay.workspace.themes.java.build=false

#
# Set this to true if you have enabled the Target Platform plugin (i.e. you
# have set the above property) and you want to apply the TargetPlatformIDE
# plugin to the root workspace project. This will cause all of the BOM
# artifacts jars and their Java sources to be indexed by your IDE. Setting
# this property to true can slow down your IDE's project synchronization.
#
#target.platform.index.sources=false


#
# Set the subscription key for Microsoft Translation integration.
# Subscription to the Translator Text Translation API on Microsoft Cognitive
# Services is required. Basic subscriptions, up to 2 million characters a
# month, are free. See
# http://docs.microsofttranslator.com/text-translate.html for more
# information.
#
microsoft.translator.subscription.key=
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Sep 25 22:47:42 CEST 2019
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion modules/calculator/calculator-api/bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bundle-Name: Calculator Client API
Bundle-SymbolicName: it.dontesta.labs.liferay.webservice.calculator.api
Bundle-Version: 1.0.0
Bundle-Version: 2.0.0
Export-Package:\
it.dontesta.labs.liferay.webservice.calculator.api,\
it.dontesta.labs.liferay.webservice.calculator.exception
3 changes: 1 addition & 2 deletions modules/calculator/calculator-api/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
dependencies {
compileOnly group: "org.osgi", name: "org.osgi.core", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.3.0"
compileOnly group: "com.liferay.portal", name: "release.portal.api"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 Antonio Musarra's Blog - https://www.dontesta.it
* Copyright (c) 2009-present Antonio Musarra's Blog - https://www.dontesta.it
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 Antonio Musarra's Blog - https://www.dontesta.it
* Copyright (c) 2009-present Antonio Musarra's Blog - https://www.dontesta.it
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in the
Expand Down
Loading

0 comments on commit e8eb6c7

Please sign in to comment.