Skip to content

Commit f503988

Browse files
zbynekzbynek
committed
Flip dependency
1 parent d091c46 commit f503988

File tree

5 files changed

+34
-70
lines changed

5 files changed

+34
-70
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
uses: actions/upload-artifact@v4
2424
with:
2525
name: gwt-site
26-
path: 'target/generated-site/'
26+
path: 'content/target/generated-site/'

‎README.md‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,31 @@
1010

1111
* See: https://www.gwtproject.org/makinggwtbetter.html#webpage
1212

13+
## Requirements
14+
[Apache Maven](http://maven.apache.org) 3.8 or greater, and JDK 11+ in order to run.
15+
1316
## Building
1417

1518
If you have Grunt installed :
1619
* build the assets using Grunt: `grunt`
1720
* then run: `mvn clean install`
18-
* after that you will find the generated documentation in `target/generated-site/`.
21+
* after that you will find the generated documentation in `content/target/generated-site/`.
1922

2023
If you don't have Grunt installer :
2124
* build the assets using Maven and Grunt plugin: `mvn clean install -Pgrunt`
22-
* after that you will find the generated documentation in `target/generated-site/`.
25+
* after that you will find the generated documentation in `content/target/generated-site/`.
2326

2427
### Running locally
2528
Run the site locally for easy visual testing
2629

2730
Run without server:
28-
* Change to the `target/generated-site` folder.
31+
* Change to the `content/target/generated-site` folder.
2932
* Open the `index.html` file in your browser.
3033

3134
Run with Maven:
32-
* Run: `mvn jetty:run`
35+
* Run: `mvn -pl content jetty:run`
3336
* Open URL `http://localhost:9999` in your browser.
37+
38+
# gwt-site-webapp
39+
40+

‎content/pom.xml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,19 @@
113113
<outputDirectory>${project.build.directory}/generated-site/javadoc/latest</outputDirectory>
114114
</configuration>
115115
</execution>
116+
<execution>
117+
<id>unpack-dependencies</id>
118+
<phase>prepare-package</phase>
119+
<goals>
120+
<goal>unpack-dependencies</goal>
121+
</goals>
122+
<configuration>
123+
<includeGroupIds>org.gwtproject.site</includeGroupIds>
124+
<includeArtifactIds>gwt-site-webapp</includeArtifactIds>
125+
<excludeTransitive>true</excludeTransitive>
126+
<outputDirectory>${project.build.directory}/generated-site/</outputDirectory>
127+
</configuration>
128+
</execution>
116129
</executions>
117130
</plugin>
118131
<plugin>
@@ -175,8 +188,14 @@
175188
<artifactId>commons-io</artifactId>
176189
<version>2.7</version>
177190
</dependency>
191+
<dependency>
192+
<groupId>org.gwtproject.site</groupId>
193+
<artifactId>gwt-site-webapp</artifactId>
194+
<version>${project.version}</version>
195+
<type>war</type>
196+
<!-- <classifier>compiled-js</classifier> -->
197+
</dependency>
178198
</dependencies>
179-
180199
<profiles>
181200
<profile>
182201
<id>grunt</id>

‎web-app/pom.xml‎

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<directory>${basedir}/src/test/java</directory>
6363
</testResource>
6464
</testResources>
65-
65+
<finalName>compiled-js</finalName>
6666
<plugins>
6767
<plugin>
6868
<groupId>org.apache.maven.plugins</groupId>
@@ -133,65 +133,4 @@
133133
</plugin>
134134
</plugins>
135135
</build>
136-
<profiles>
137-
<profile>
138-
<!--
139-
Generates a full working site for testing, by unpacking the
140-
markdown along with this project's own output.
141-
-->
142-
<id>full-site</id>
143-
<dependencies>
144-
<dependency>
145-
<groupId>com.google.gwt.site</groupId>
146-
<artifactId>gwt-site</artifactId>
147-
<version>${project.version}</version>
148-
<type>zip</type>
149-
<classifier>generated-site</classifier>
150-
</dependency>
151-
</dependencies>
152-
<build>
153-
<plugins>
154-
<plugin>
155-
<artifactId>maven-dependency-plugin</artifactId>
156-
<executions>
157-
<execution>
158-
<id>unpack-dependencies</id>
159-
<phase>prepare-package</phase>
160-
<goals>
161-
<goal>unpack-dependencies</goal>
162-
</goals>
163-
<configuration>
164-
<includeGroupIds>com.google.gwt.site</includeGroupIds>
165-
<includeArtifactIds>gwt-site</includeArtifactIds>
166-
<excludeTransitive>true</excludeTransitive>
167-
<outputDirectory>${project.build.directory}/www/</outputDirectory>
168-
</configuration>
169-
</execution>
170-
</executions>
171-
</plugin>
172-
<plugin>
173-
<artifactId>maven-resources-plugin</artifactId>
174-
<executions>
175-
<execution>
176-
<!-- Along with the dependency:unpack-dependencies, this generates a complete site to test with -->
177-
<id>copy-www-resources</id>
178-
<phase>prepare-package</phase>
179-
<goals>
180-
<goal>copy-resources</goal>
181-
</goals>
182-
<configuration>
183-
<outputDirectory>${project.build.directory}/www/</outputDirectory>
184-
<resources>
185-
<resource>
186-
<directory>${project.build.directory}/${project.build.finalName}/</directory>
187-
</resource>
188-
</resources>
189-
</configuration>
190-
</execution>
191-
</executions>
192-
</plugin>
193-
</plugins>
194-
</build>
195-
</profile>
196-
</profiles>
197136
</project>

‎web-app/src/main/module.gwt.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
<entry-point class="com.google.gwt.site.webapp.client.GWTProjectEntryPoint" />
99
<add-linker name="xsiframe"/>
1010
<set-property name="compiler.useSourceMaps" value="true"/>
11-
<!-- change to localhost for development -->
1211
<set-configuration-property name="includeSourceMapUrl"
13-
value="https://www.gwtproject.org/src/__HASH___sourceMap__FRAGMENT__.json"/>
12+
value="/src/__HASH___sourceMap__FRAGMENT__.json"/>
1413

1514
<set-configuration-property name="installCode" value="false"/>
1615
<!-- remove after fix to issue 8630 lands -->

0 commit comments

Comments
 (0)