Skip to content

Commit

Permalink
#23934 include in 22.03.8
Browse files Browse the repository at this point in the history
  • Loading branch information
erickgonzalez committed Jul 31, 2023
1 parent bb1e7b2 commit 3786c03
Show file tree
Hide file tree
Showing 7 changed files with 457 additions and 20 deletions.
3 changes: 2 additions & 1 deletion HOTFIX_TRACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,5 @@ This maintenance release includes the following code fixes:
130. https://github.com/dotCMS/core/issues/24415 : Related content doesn't match with Content Language #24415
131. https://github.com/dotCMS/core/issues/23276 : Content detailed page throwing 404 when URL contains a trailing slash. #23276
132. https://github.com/dotCMS/core/issues/21492 : Toggle to Code in WYSIWYG Makes UI Jump #21492
133. https://github.com/dotCMS/core/issues/23948 : Stop redirecting all BE page traffic to edit mode #23948
133. https://github.com/dotCMS/core/issues/23948 : Stop redirecting all BE page traffic to edit mode #23948
134. https://github.com/dotCMS/core/issues/23934 : Old Tika Version Pulling Wrong Width from Image for Metadata #23934
21 changes: 8 additions & 13 deletions dotCMS/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ apply plugin: 'project-report' /*For gradle dependencies: ./gradlew htmlDependen
apply plugin: 'idea'
apply plugin: 'eclipse'

targetCompatibility = 1.9
sourceCompatibility = 1.9
targetCompatibility = 11
sourceCompatibility = 11

// Compile Java.
compileJava {
Expand Down Expand Up @@ -143,24 +143,19 @@ dependencies {
felix (group: 'org.osgi', name: 'org.osgi.compendium', version: '4.3.1') {
transitive = false
}
felix(group: 'org.apache.tika', name: 'tika-core', version: '1.19') {
transitive = false
}
felix(group: 'org.apache.tika', name: 'tika-bundle', version: '1.19') {
transitive = false
}

felix group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
felix group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.25'
felix group: 'com.dotcms.tika', name: 'com.dotcms.tika', version: '0.2'
felix group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.35'
felix group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.35'

felix group: 'com.dotcms.tika', name: 'com.dotcms.tika', version: '2.7.0'

felix group: 'com.dotcms.samlbundle', name: 'com.dotcms.samlbundle', version: '22.03'
/**** And now the libs we pull in from internal company sources - libs stored in ./plugins, ./bin, ./libs, the starter site, etc. ****/
compile fileTree("src/main/plugins/com.dotcms.config/build/jar").include('plugin-com.dotcms.config.jar')

starter group: 'com.dotcms', name: 'starter', version: 'empty_20211201', ext: 'zip'
//starter group: 'com.dotcms', name: 'starter', version: 'empty_20211201', ext: 'zip'
//Uncomment this line if you want to download the starter that comes with data
//starter group: 'com.dotcms', name: 'starter', version: '20220209', ext: 'zip'
starter group: 'com.dotcms', name: 'starter', version: '20220209', ext: 'zip'
testsStarter group: 'com.dotcms', name: 'starter', version: 'empty_20211201', ext: 'zip'

profiler group: 'glowroot-custom', name: 'glowroot-agent', version: '0.13.1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.dotcms.storage.model.BasicMetadataFields;
import com.dotcms.storage.model.ContentletMetadata;
import com.dotcms.storage.model.Metadata;
import com.dotcms.util.CollectionsUtils;
import com.dotcms.util.IntegrationTestInitService;
import com.dotmarketing.business.APILocator;
import com.dotmarketing.business.CacheLocator;
Expand All @@ -43,12 +44,7 @@
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.SortedSet;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.io.FilenameUtils;
import org.junit.Assert;
Expand Down Expand Up @@ -92,6 +88,27 @@ public void Test_Get_Metadata_Property() throws Exception {
assertTrue(fileAssetContent.get(FileAssetAPI.META_DATA_FIELD) instanceof Map);
}

/**
* <b>Method to test:</b> {@link FileMetadataAPI#getFullMetadataNoCache(File, Supplier)}<br>
* <b>Given scenario:</b> Getting metadata from a urlMap<br>
* <b>Expected Result:</b> Some keywords must be present in the metadata
* @throws Exception
*/
@Test
public void Test_Generate_Metadata_From_HtmlPage_Should_Resolve_ExtendedMetadata() throws Exception {
prepareIfNecessary();
final List<String> extendedMetadata = CollectionsUtils.list("metaKeyword", "keywords", "dcSubject",
"title", "dcTitle", "description", "copyright", "ogTitle", "language", "ogUrl", "ogImage");
Metadata metadata = fileMetadataAPI.getFullMetadataNoCache(new
File(FileMetadataAPITest.class.getResource("5-snow-sports-to-try-this-winter").getFile()),
null);
assertNotNull(metadata);
assertTrue(metadata.getMap().keySet().containsAll(extendedMetadata));
assertEquals("5 Snow Sports to Try This Winter", metadata.getMap().get("dcTitle"));
assertEquals("5 Snow Sports to Try This Winter", metadata.getMap().get("title"));

}


/**
* This test evaluates both basic vs full MD
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,288 @@
<!doctype html>
<html lang="en">

<head>



<meta charset="utf-8">
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, maximum-scale=5.0, user-scalable=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta charset="utf-8">
<link rel="icon" href="/application/themes/travel/images/favicon.ico" type="image/x-icon">
<title>5 Snow Sports to Try This Winter</title>
<meta name="description" content="$pDescription">
<meta name="language" content="english">
<meta name="author" content="dotCMS">
<meta name="metaKeyword" content="MyKeyword">
<meta name="copyright" content="dotCMS LLC, Miami Florida, US">
<meta property="og:title" content="5 Snow Sports to Try This Winter">
<meta property="og:url" content="https://demo.dotcms.com$!{request.getAttribute("javax.servlet.forward.request_uri")}">
<meta property="og:image" content="/dA/0edfee78-2a75-4f3d-bf20-813aae15d4e9/1200w/50q/outdoor-winter-sports-5a6e94fa1f4e130037158605.jpeg">
<link rel="canonical" href="https://demo.dotcms.com$!{request.getAttribute("javax.servlet.forward.request_uri")}">

<!-- CSS -->
<link rel="preload" as="style" href="//fonts.googleapis.com/css?family=Oswald:500,600,700%7CRoboto:300,300i,700%7CCondiment%7CDella+Respira">
<link rel="preload" as="style" href="/application/themes/travel/css/styles.dotsass">
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Oswald:500,600,700%7CRoboto:300,300i,700%7CCondiment%7CDella+Respira">
<link rel="stylesheet" href="/application/themes/travel/css/styles.dotsass">

</head>

<body id="blog-detail" >


<div class="body-wrapper">









<section id="section-1" class="section "><!-- section -->
<div class="container"><!-- container -->
<div class="row"><!-- row -->



<div class=" col-lg-10 offset-lg-1 "><!-- Column -->


<!-- VTL File: /application/vtl/blogs/blog-detail.vtl -->
<div class="section-blog-post">

<div class="section-blog-post-header">
<h1
>5 Snow Sports to Try This Winter</h1>
<div class="post-bottom-panel">
<div>
<div class="group-xl">
<div class="post-modern-author">
<span class="post-icon icon mdi mdi-account"></span>
<span>by John Smith</span>
</div>
<div class="post-modern-time">
<span class="post-icon icon mdi mdi-calendar-clock"></span>
<time datetime="2018-07-20 12:29">July 12, 2019 at 06:15 PM</time>
</div>
</div>
</div>
<div class="d-none d-md-block">
<div class="group-xl">
<div class="post-modern-views">
<span class="post-icon icon mdi mdi-eye"></span>
<span>193</span>
</div>
<div class="post-modern-comment">
<span class="post-icon icon mdi mdi-comment"></span>
<a href="#comments">3</a>
</div>
</div>
</div>
</div>
</div>

<!-- BLOG IMAGE -->
<div class="section-blog-post-figure">
<!-- <img class="img-fluid" style="min-width: 100%;" src="/dA/0edfee78-2a75-4f3d-bf20-813aae15d4e9/935cw/400ch/50q/outdoor-winter-sports-5a6e94fa1f4e130037158605.jpeg" alt="5 Snow Sports to Try This Winter"> -->
<img class="img-fluid" src="/contentAsset/image/0edfee78-2a75-4f3d-bf20-813aae15d4e9/image/filter/Resize,Crop/resize_w/935/crop_w/935/crop_h/400/outdoor-winter-sports-5a6e94fa1f4e130037158605.jpeg" alt="5 Snow Sports to Try This Winter">
<span class="badge badge-primary">cross-country skiing</span>
</div>

<!-- BLOG BODY -->
<div class="section-blog-post-content"
>

<p style="text-align: left">


Checkout the following sports to have fun this winter.


</p>

<h2 style="text-align: left">


Snow Shoeing


</h2>

<p style="text-align: left">


Snowshoeing is the fasted growing winter sport in the world, primarily because it is simple to get to grips with. There are many levels of snowshoeing, whether you want to hike for pleasure, trek through the backcountry, or competitively race. Snowshoeing is a fantastic alternative for skiing, especially if you like running!


</p>

<h2 style="text-align: left">


Ice Skating


</h2>

<p style="text-align: left">


A fun activity with the kids, a silly activity to try after a few drinks, or a fantastic innovative date idea, ice skating is great fun for children and adults alike. However, if you’re a bit unsteady on your feet, just make sure you take a good friend you can desperately cling to


</p>

<h2 style="text-align: left">


Snow Tubing


</h2>

<p style="text-align: left">


Tubing is often seen as something for kids to enjoy, but it can be a rewarding snow sport for adults, too. Sliding down the slopes is a great way to let go of work stress and have fun without a lot of effort. It also burns a surprising number of calories. If you want to mix up your workout routine or need a break from some of your heavier routines, consider giving tubing a try.


</p>

<h2 style="text-align: left">


Ice Climbing


</h2>

<p style="text-align: left">


Climbing up a vertical sheet of ice may seem like an extreme sport (and it can be), but if you enlist a certified instructor to get you started, ice climbing is actually surprisingly accessible for beginners. In fact, because you wear special shoes (crampons) with spikes on the front, it's actually easier to get your footing than when going rock climbing.


</p>

<h2 style="text-align: left">


Fat Biking


</h2>

<p style="text-align: left">


You don't need to give up on cycling as soon as cold weather hits, but you might need to rent or buy a bike designed to take on the snow. "Fat bikes" are outfitted with oversized fat tires.


</p>

<h2 style="text-align: left">


Destinations


</h2>

<p style="text-align: left">


A couple of places we recommend visiting to do this type of sports:


</p>

<div class="blog-contentlet">
<img class="blog-contentlet__image" alt="Colorado & The Rockies" src="/dA/c56e5030-fc88-480c-9b2e-4582fd762437/370w/20q"/ />

<div class="blog-contentlet__desc">
<h3>Colorado & The Rockies</h3>
<span>
Book an Colorado vacation rental and get ready to experience small-town charm infused with luxury living in one of the top US vacation destinations.
</span>
</div>
<div class="blog-contentlet__action">
<a class="button button-primary custom-block-content-info" href="/destinations/colorado">View Details</a>
</div>
</div>
<div class="blog-contentlet">
<img class="blog-contentlet__image" alt="French Alps" src="/dA/77f953d1-529e-435c-8195-630efbb6bf58/370w/20q"/ />

<div class="blog-contentlet__desc">
<h3>French Alps</h3>
<span>
Courchevel is part of the world’s biggest lift-linked ski area, has the most balanced range of runs in the 3 Vallées to suit all abilities, reliable snow: what more could you wish for? You could come to Les 3 Vallées for weeks and never ski the same slope twice; and there’s no better place to experience it all than at Courchevel! Courchevel’s four separate villages sit amongst the north-facing slopes on the left side of the map and offer probably the most balanced selection of greens, blues, reds, and blacks in the 3 Vallées, making it our top resort here. If you’re up for exploring more however, the ski area is well linked so getting to the other end isn’t too difficult.
</span>
</div>
<div class="blog-contentlet__action">
<a class="button button-primary custom-block-content-info" href="/destinations/french-alps">View Details</a>
</div>
</div>
</div>

<!-- SOCIAL SHARES -->
<div class="group-xl text-center">
<a class="button button-md button-facebook button-icon button-icon-left button-leaf" href="https://www.facebook.com/dotCMS/"><span class="icon mdi mdi-facebook"></span>Facebook</a>
<a class="button button-md button-twitter button-icon button-icon-left button-leaf" href="https://twitter.com/dotcms"><span class="icon mdi mdi-twitter"></span>Twitter</a>
<a class="button button-md button-linkedin button-icon button-icon-left button-leaf" href="https://www.linkedin.com/company/2307658/"><span class="icon mdi mdi-linkedin"></span>LinkedIn</a>
</div>
</div>

<!-- COMMENTS -->
<div id="comments" class="pt-5 mt-5">



<div class="row">
<div class="col"><h2>Comments</h2></div>
<div class="col text-right"><a href="#webup" class="button button-md button-primary button-leaf" id="addComment"><span class="mdi mdi-plus"></span> Comment</a></div>
</div>






<div class="row mt-5 pt-5">
<div class="col-lg-12">
<h2 id="comments" class="mb-2">Leave a Comment</h2>

<form id="webup">
<input type="hidden" id="blogTitle" name="blogTitle" value="5 Snow Sports to Try This Winter">
<input type="hidden" id="blogId" name="blogId" value="0edfee78-2a75-4f3d-bf20-813aae15d4e9">
<input type="hidden" id="commenterId" name="commenterId" value="system">
<input type="hidden" id="todayDateTime" name="today" value="05/11/23 22:36:25">
<input type="hidden" id="returnUrl" name="returnUrl" value="/blog/post/5-snow-sports-to-try-this-winter#comments">
<div class="form-wrap">
<label class="form-label rd-input-label sr-only" for="contact-message">Message</label>
<textarea class="form-input form-control-has-validation form-control-last-child" id="commentBody" name="commentBody" placeholder="Type a comment about this blog. Your feedback is appreciated"></textarea>
</div>
<input type="submit" class="button button-primary" value="Submit">
</form>

</div>
</div> </div>



<div></div>
</div><!-- Column -->

</div><!-- /row -->
</div><!-- /container -->
</section><!-- /section -->

</div><!-- /body-wrapper -->

<!-- Page Footer-->

</body>
</html>

0 comments on commit 3786c03

Please sign in to comment.