Skip to content

Commit

Permalink
Merge branch '4.1.x-vaadin-new' into branches/4.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
colinduplantis committed Jan 16, 2022
2 parents fbad13a + 93d860b commit 0e8b732
Show file tree
Hide file tree
Showing 53 changed files with 11,409 additions and 36 deletions.
13 changes: 10 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,20 @@ target-eclipse
.externalToolBuilders
maven-eclipse.xml

# Vaadin Generated Artifacts
**/VAADIN/widgetsets/

# Marketcetera Artifacts
.metc_host.txt
**/cmd_exec/instances/

# IntelliJ Artifacts
*.iml
.idea

# Vaadin Artifacts
**/VAADIN/widgetsets/
package.json
pnpm-lock.yaml
frontend
node_modules
pnpmfile.js
webpack.config.js
webpack.generated.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package org.marketcetera.admin;

import org.marketcetera.core.Factory;

/* $License$ */

/**
Expand All @@ -10,6 +12,7 @@
* @since $Release$
*/
public interface UserFactory
extends Factory<User>
{
/**
* Create user objects.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.marketcetera.admin.MutableUser;
import org.marketcetera.admin.MutableUserFactory;
import org.marketcetera.admin.User;

/* $License$ */

Expand All @@ -15,6 +16,17 @@
public class SimpleUserFactory
implements MutableUserFactory
{
/* (non-Javadoc)
* @see org.marketcetera.core.Factory#create(java.lang.Object)
*/
@Override
public User create(User inUser)
{
return create(inUser.getName(),
inUser.getHashedPassword(),
inUser.getDescription(),
inUser.isActive());
}
/* (non-Javadoc)
* @see com.marketcetera.admin.UserFactory#create(java.lang.String, java.lang.String, java.lang.String, boolean)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@
public class PersistentUserFactory
implements MutableUserFactory
{
/* (non-Javadoc)
* @see org.marketcetera.core.Factory#create(java.lang.Object)
*/
@Override
public PersistentUser create(User inUser)
{
return create(inUser.getName(),
inUser.getHashedPassword(),
inUser.getDescription(),
inUser.isActive());
}
/* (non-Javadoc)
* @see com.marketcetera.admin.UserFactory#create(java.lang.String, java.lang.String, java.lang.String, boolean)
*/
Expand Down
51 changes: 18 additions & 33 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@
<mvn.log4j.version>2.17.1</mvn.log4j.version>
<mvn.test.options>-Xmx2048m -Xms128m</mvn.test.options>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss.SSS Z</maven.build.timestamp.format>
<vaadin.version>7.7.13</vaadin.version>
<vaadin.theme>mytheme</vaadin.theme>
<gwt.version>2.9.0</gwt.version>
<gwt.plugin.version>2.9.0</gwt.plugin.version>
<vaadin.version>21.0.0.alpha10</vaadin.version>
<mvn.flyway.version>8.4.0</mvn.flyway.version>
</properties>
<dependencyManagement>
Expand Down Expand Up @@ -403,32 +400,6 @@
<version>${project.version}</version>
</dependency>
<!-- Compile: Vaadin -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring-boot-starter</artifactId>
<version>1.2.0</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiled</artifactId>
<version>${vaadin.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId>
<version>${vaadin.version}</version>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-themes</artifactId>
<version>${vaadin.version}</version>
</dependency>
<!-- Compile: QuickFIX/J -->
<dependency>
<groupId>org.quickfixj</groupId>
Expand Down Expand Up @@ -817,12 +788,12 @@
<scope>runtime</scope>
</dependency>
<!-- Runtime: Vaadin -->
<dependency>
<!--dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-push</artifactId>
<scope>runtime</scope>
<version>${vaadin.version}</version>
</dependency>
</dependency-->
<!-- Testing: local modules. -->
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down Expand Up @@ -1261,7 +1232,8 @@
<module>rpc-core</module>
<module>trade</module>
<module>tools</module>
<module>ui</module>
<!--module>ui</module-->
<module>ui-new</module>
<module>util</module>
<module>util-test</module>
</modules>
Expand Down Expand Up @@ -1290,6 +1262,19 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>vaadin-prereleases</id>
<url>
https://maven.vaadin.com/vaadin-prereleases/
</url>
</repository>
<repository>
<id>Vaadin Directory</id>
<url>https://maven.vaadin.com/vaadin-addons</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Expand Down
118 changes: 118 additions & 0 deletions ui-new/.mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
/*
* Copyright 2007-present the original author or authors.
*
* 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.
*/
import java.net.*;
import java.io.*;
import java.nio.channels.*;
import java.util.Properties;

public class MavenWrapperDownloader {

private static final String WRAPPER_VERSION = "0.5.6";
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is
* provided.
*/
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";

/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl
* property to use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties";

/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar";

/**
* Name of the property which should be used to override the default download
* url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";

public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());

// If the maven-wrapper.properties exists, read it and check if it contains a
// custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if (mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
if (mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: " + url);

File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if (!outputFile.getParentFile().exists()) {
if (!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
}
}

private static void downloadFileFromURL(String urlString, File destination) throws Exception {
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
String username = System.getenv("MVNW_USERNAME");
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
Authenticator.setDefault(new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(username, password);
}
});
}
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
}

}
2 changes: 2 additions & 0 deletions ui-new/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
6 changes: 6 additions & 0 deletions ui-new/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# NOTICE: this is an auto-generated file
#
# This file sets the default parameters for manual `pnpm install`.
#
shamefully-hoist=true
4 changes: 4 additions & 0 deletions ui-new/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
singleQuote: true,
printWidth: 120,
};
9 changes: 9 additions & 0 deletions ui-new/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"recommendations": [
"runem.lit-plugin",
"vscjava.vscode-java-pack",
"pivotal.vscode-spring-boot",
"vaadin.studio"
],
"unwantedRecommendations": []
}
3 changes: 3 additions & 0 deletions ui-new/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"lit-plugin.strict": true
}
24 changes: 24 additions & 0 deletions ui-new/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
This is free and unencumbered software released into the public domain.

Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.

In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For more information, please refer to <http://unlicense.org>
44 changes: 44 additions & 0 deletions ui-new/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Marketcetera Automated Trading Platform

This project can be used as a starting point to create your own Vaadin application with Spring Boot.
It contains all the necessary configuration and some placeholder files to get you started.

## Running the application
The project is a standard Maven project. To run it from the command line,
type `mvnw` (Windows), or `./mvnw` (Mac & Linux), then open
http://localhost:8080 in your browser.

You can also import the project to your IDE of choice as you would with any
Maven project. Read more on [how to set up a development environment for
Vaadin projects](https://vaadin.com/docs/latest/guide/install) (Windows, Linux, macOS).

## Deploying to Production
To create a production build, call `mvnw clean package -Pproduction` (Windows),
or `./mvnw clean package -Pproduction` (Mac & Linux).
This will build a JAR file with all the dependencies and front-end resources,
ready to be deployed. The file can be found in the `target` folder after the build completes.

Once the JAR file is built, you can run it using
`java -jar target/myapp-1.0-SNAPSHOT.jar` (NOTE, replace
`myapp-1.0-SNAPSHOT.jar` with the name of your jar).

## Project structure

- `MainView.java` in `src/main/java` contains the navigation setup (i.e., the
side/top bar and the main menu). This setup uses
[App Layout](https://vaadin.com/components/vaadin-app-layout).
- `views` package in `src/main/java` contains the server-side Java views of your application.
- `views` folder in `frontend/` contains the client-side JavaScript views of your application.
- `themes` folder in `frontend/` contains the custom CSS styles.

## Useful links

- Read the documentation at [vaadin.com/docs](https://vaadin.com/docs).
- Follow the tutorials at [vaadin.com/tutorials](https://vaadin.com/tutorials).
- Watch training videos and get certified at [vaadin.com/learn/training]( https://vaadin.com/learn/training).
- Create new projects at [start.vaadin.com](https://start.vaadin.com/).
- Search UI components and their usage examples at [vaadin.com/components](https://vaadin.com/components).
- Find a collection of solutions to common use cases in [Vaadin Cookbook](https://cookbook.vaadin.com/).
- Find Add-ons at [vaadin.com/directory](https://vaadin.com/directory).
- Ask questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/vaadin) or join our [Discord channel](https://discord.gg/MYFq5RTbBn).
- Report issues, create pull requests in [GitHub](https://github.com/vaadin/).
Loading

0 comments on commit 0e8b732

Please sign in to comment.